1.1 --- a/jabberd/jabberd.spec Tue Apr 02 20:44:50 2013 +0200
1.2 +++ b/jabberd/jabberd.spec Sun Jun 30 18:44:10 2013 +0200
1.3 @@ -24,7 +24,7 @@
1.4 # package version
1.5 %define V_major 2.2
1.6 %define V_minor 17
1.7 -%define V_mucon 0.8
1.8 +%define V_mucon 0.8.81
1.9
1.10 # package information
1.11 Name: jabberd
1.12 @@ -37,7 +37,7 @@
1.13 Group: InstantMessaging
1.14 License: JOSL/GPL
1.15 Version: %{V_major}.%{V_minor}
1.16 -Release: 20120800
1.17 +Release: 20130000
1.18
1.19 # package options
1.20 %option with_sqlite yes
1.21 @@ -48,7 +48,7 @@
1.22
1.23 # list of sources
1.24 Source0: http://www.github.com/downloads/Jabberd2/jabberd2/jabberd-%{version}.tar.xz
1.25 -Source1: http://download.gna.org/mu-conference/mu-conference_%{V_mucon}.tar.gz
1.26 +Source1: http://download.gna.org/mu-conference/mu-conference-%{V_mucon}.tar.gz
1.27 Source1: rc.jabberd
1.28 Patch0: jabberd.patch
1.29
1.30 @@ -83,7 +83,7 @@
1.31 messaging platform. JabberD 2 is the next generation of the JabberD
1.32 server. It has been rewritten from the ground up to be scalable,
1.33 architecturally sound, and to support the latest protocol extensions
1.34 - coming out of the JSF.
1.35 + coming out of the XSF.
1.36
1.37 %track
1.38 prog jabberd = {
1.39 @@ -94,7 +94,7 @@
1.40 prog jabberd:mucon = {
1.41 version = %{V_mucon}
1.42 url = http://download.gna.org/mu-conference/
1.43 - regex = mu-conference_(__VER__)\.tar\.gz
1.44 + regex = mu-conference-(__VER__)\.tar\.gz
1.45 }
1.46
1.47 %prep
1.48 @@ -111,10 +111,10 @@
1.49 %{l_shtool} subst \
1.50 -e 's;^\(CFLAGS\ *:=.*pkg-config --cflags glib-2.0\);\1 libidn;' \
1.51 -e 's;^\(LIBS\ *:=.*\);\1 $(LOCLIBS);' \
1.52 - mu-conference_%{V_mucon}/src/Makefile
1.53 + mu-conference-%{V_mucon}/src/Makefile
1.54 %{l_shtool} subst \
1.55 -e 's;mu-conference.log;muc.log;g' \
1.56 - mu-conference_%{V_mucon}/src/jcomp/jcr_log.c
1.57 + mu-conference-%{V_mucon}/src/jcomp/jcr_log.c
1.58 %{l_shtool} subst \
1.59 -e 's;<port>[0-9][0-9]*</port>;<port>5347</port>;' \
1.60 -e 's;<spool>.*</spool>;<spool>%{l_prefix}/var/jabberd/spool/rooms</spool>;' \
1.61 @@ -123,7 +123,7 @@
1.62 -e 's;<pidfile>.*</pidfile>;<pidfile>%{l_prefix}/var/jabberd/pid/muc.pid</pidfile>;' \
1.63 -e 's;<URL>.*</URL>;<URL>http://name.host.tld/</URL>;' \
1.64 -e 's;<stylesheet>.*</stylesheet>;<stylesheet>%{l_prefix}/share/jabberd/style.css</stylesheet>;' \
1.65 - mu-conference_%{V_mucon}/muc-default.xml
1.66 + mu-conference-%{V_mucon}/muc-default.xml
1.67 echo \
1.68 'muc @sysconfdir@/muc.xml' \
1.69 >>etc/jabberd.cfg.dist.in
1.70 @@ -188,15 +188,15 @@
1.71 # build program
1.72 %{l_make} %{l_mflags -O}
1.73
1.74 +#http://www.suramya.com/linux/tutorials/JabberSetup/
1.75 %if "%{with_mucon}" == "yes"
1.76 -#http://www.suramya.com/linux/tutorials/JabberSetup/
1.77 loclibs=''
1.78 case "%{l_platform -t}" in
1.79 *-sunos* )
1.80 loclibs='-lsocket -lnsl'
1.81 ;;
1.82 esac
1.83 - ( cd mu-conference_%{V_mucon}
1.84 + ( cd mu-conference-%{V_mucon}
1.85 %{l_make} %{l_mflags -O} LOCLIBS=$loclibs
1.86 ) || exit $?
1.87 %endif
1.88 @@ -222,13 +222,13 @@
1.89 $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/logs \
1.90 $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/rooms
1.91 %{l_shtool} install -c -m 644 \
1.92 - mu-conference_%{V_mucon}/muc-default.xml \
1.93 + mu-conference-%{V_mucon}/muc-default.xml \
1.94 $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/muc.xml
1.95 %{l_shtool} install -c \
1.96 - mu-conference_%{V_mucon}/src/mu-conference \
1.97 + mu-conference-%{V_mucon}/src/mu-conference \
1.98 $RPM_BUILD_ROOT%{l_prefix}/bin/
1.99 %{l_shtool} install -c \
1.100 - mu-conference_%{V_mucon}/style.css \
1.101 + mu-conference-%{V_mucon}/style.css \
1.102 $RPM_BUILD_ROOT%{l_prefix}/share/jabberd
1.103 %endif
1.104
