OpenPKG Specs / changeset

     1.1 --- a/jabberd/jabberd.patch	Tue Apr 02 20:44:50 2013 +0200
     1.2 +++ b/jabberd/jabberd.patch	Sun Jun 30 18:44:10 2013 +0200
     1.3 @@ -204,3 +204,33 @@
     1.4   
     1.5   #include <expat.h>
     1.6   
     1.7 +diff -Nau mu-conference-0.8.81/src/main.c.orig mu-conference-0.8.81/src/main.c
     1.8 +Index: mu-conference-0.8.81/src/main.c
     1.9 +--- mu-conference-0.8.81/src/main.c.orig	2013-07-01 00:12:58.147291969 +0200
    1.10 ++++ mu-conference-0.8.81/src/main.c	2013-06-30 23:15:28.653657696 +0200
    1.11 +@@ -51,7 +51,7 @@
    1.12 + 
    1.13 +   jcr = (jcr_instance)calloc(1, sizeof(_jcr_instance));
    1.14 + 
    1.15 +-  g_thread_init(NULL);
    1.16 ++  g_thread_init_glib(NULL);
    1.17 +   fprintf(stderr, "%s -- %s\n%s\n\n", _JCOMP_NAME, _JCOMP_VERS, _JCOMP_COPY);
    1.18 + 
    1.19 +   while ((c = getopt(argc, argv, "Bshd:c:")) != EOF)
    1.20 +diff -Nau mu-conference-0.8.81/src/jcomp/jcr_deliver.c.orig mu-conference-0.8.81/src/jcomp/jcr_deliver.c
    1.21 +Index: mu-conference-0.8.81/src/jcomp/jcr_deliver.c
    1.22 +--- mu-conference-0.8.81/src/jcomp/jcr_deliver.c.orig	2013-06-14 21:42:45.000000000 +0200
    1.23 ++++ mu-conference-0.8.81/src/jcomp/jcr_deliver.c	2013-07-01 03:13:46.888580626 +0200
    1.24 +@@ -33,11 +33,11 @@
    1.25 +     sleep(1);
    1.26 +   }
    1.27 + 
    1.28 +-  g_async_queue_push(jcr->dqueue, d);
    1.29 +   log_debug(JDBG, "queued %lu bytes now %lu msgs : >>> %s <<<",
    1.30 + 	    strlen(xmlnode2str(d->x)),
    1.31 + 	    g_async_queue_length(jcr->dqueue),
    1.32 + 	    xmlnode2str(d->x));
    1.33 ++  g_async_queue_push(jcr->dqueue, d);
    1.34 + }
    1.35 + 
    1.36 + void jcr_queue_deliver(void *a) {

     2.1 --- a/jabberd/jabberd.spec	Tue Apr 02 20:44:50 2013 +0200
     2.2 +++ b/jabberd/jabberd.spec	Sun Jun 30 18:44:10 2013 +0200
     2.3 @@ -24,7 +24,7 @@
     2.4  #   package version
     2.5  %define       V_major 2.2
     2.6  %define       V_minor 17
     2.7 -%define       V_mucon 0.8
     2.8 +%define       V_mucon 0.8.81
     2.9  
    2.10  #   package information
    2.11  Name:         jabberd
    2.12 @@ -37,7 +37,7 @@
    2.13  Group:        InstantMessaging
    2.14  License:      JOSL/GPL
    2.15  Version:      %{V_major}.%{V_minor}
    2.16 -Release:      20120800
    2.17 +Release:      20130000
    2.18  
    2.19  #   package options
    2.20  %option       with_sqlite yes
    2.21 @@ -48,7 +48,7 @@
    2.22  
    2.23  #   list of sources
    2.24  Source0:      http://www.github.com/downloads/Jabberd2/jabberd2/jabberd-%{version}.tar.xz
    2.25 -Source1:      http://download.gna.org/mu-conference/mu-conference_%{V_mucon}.tar.gz
    2.26 +Source1:      http://download.gna.org/mu-conference/mu-conference-%{V_mucon}.tar.gz
    2.27  Source1:      rc.jabberd
    2.28  Patch0:       jabberd.patch
    2.29  
    2.30 @@ -83,7 +83,7 @@
    2.31      messaging platform. JabberD 2 is the next generation of the JabberD
    2.32      server. It has been rewritten from the ground up to be scalable,
    2.33      architecturally sound, and to support the latest protocol extensions
    2.34 -    coming out of the JSF.
    2.35 +    coming out of the XSF.
    2.36  
    2.37  %track
    2.38      prog jabberd = {
    2.39 @@ -94,7 +94,7 @@
    2.40      prog jabberd:mucon = {
    2.41          version   = %{V_mucon}
    2.42          url       = http://download.gna.org/mu-conference/
    2.43 -        regex     = mu-conference_(__VER__)\.tar\.gz
    2.44 +        regex     = mu-conference-(__VER__)\.tar\.gz
    2.45      }
    2.46  
    2.47  %prep
    2.48 @@ -111,10 +111,10 @@
    2.49      %{l_shtool} subst \
    2.50          -e 's;^\(CFLAGS\ *:=.*pkg-config --cflags glib-2.0\);\1 libidn;' \
    2.51          -e 's;^\(LIBS\ *:=.*\);\1 $(LOCLIBS);' \
    2.52 -        mu-conference_%{V_mucon}/src/Makefile
    2.53 +        mu-conference-%{V_mucon}/src/Makefile
    2.54      %{l_shtool} subst \
    2.55          -e 's;mu-conference.log;muc.log;g' \
    2.56 -        mu-conference_%{V_mucon}/src/jcomp/jcr_log.c
    2.57 +        mu-conference-%{V_mucon}/src/jcomp/jcr_log.c
    2.58      %{l_shtool} subst \
    2.59          -e 's;<port>[0-9][0-9]*</port>;<port>5347</port>;' \
    2.60          -e 's;<spool>.*</spool>;<spool>%{l_prefix}/var/jabberd/spool/rooms</spool>;' \
    2.61 @@ -123,7 +123,7 @@
    2.62          -e 's;<pidfile>.*</pidfile>;<pidfile>%{l_prefix}/var/jabberd/pid/muc.pid</pidfile>;' \
    2.63          -e 's;<URL>.*</URL>;<URL>http://name.host.tld/</URL>;' \
    2.64          -e 's;<stylesheet>.*</stylesheet>;<stylesheet>%{l_prefix}/share/jabberd/style.css</stylesheet>;' \
    2.65 -        mu-conference_%{V_mucon}/muc-default.xml
    2.66 +        mu-conference-%{V_mucon}/muc-default.xml
    2.67      echo \
    2.68          'muc         @sysconfdir@/muc.xml' \
    2.69          >>etc/jabberd.cfg.dist.in
    2.70 @@ -188,15 +188,15 @@
    2.71      #   build program
    2.72      %{l_make} %{l_mflags -O}
    2.73  
    2.74 +#http://www.suramya.com/linux/tutorials/JabberSetup/
    2.75  %if "%{with_mucon}" == "yes"
    2.76 -#http://www.suramya.com/linux/tutorials/JabberSetup/
    2.77      loclibs=''
    2.78      case "%{l_platform -t}" in
    2.79          *-sunos* )
    2.80              loclibs='-lsocket -lnsl'
    2.81              ;;
    2.82      esac
    2.83 -    ( cd mu-conference_%{V_mucon}
    2.84 +    ( cd mu-conference-%{V_mucon}
    2.85        %{l_make} %{l_mflags -O} LOCLIBS=$loclibs
    2.86      ) || exit $?
    2.87  %endif
    2.88 @@ -222,13 +222,13 @@
    2.89          $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/logs \
    2.90          $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/rooms
    2.91      %{l_shtool} install -c -m 644 \
    2.92 -        mu-conference_%{V_mucon}/muc-default.xml \
    2.93 +        mu-conference-%{V_mucon}/muc-default.xml \
    2.94          $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/muc.xml
    2.95      %{l_shtool} install -c \
    2.96 -        mu-conference_%{V_mucon}/src/mu-conference \
    2.97 +        mu-conference-%{V_mucon}/src/mu-conference \
    2.98          $RPM_BUILD_ROOT%{l_prefix}/bin/
    2.99      %{l_shtool} install -c \
   2.100 -        mu-conference_%{V_mucon}/style.css \
   2.101 +        mu-conference-%{V_mucon}/style.css \
   2.102          $RPM_BUILD_ROOT%{l_prefix}/share/jabberd
   2.103  %endif
   2.104