OpenPKG Specs / changeset

     1.1 --- a/dbus/dbus.patch	Mon Jan 12 19:09:19 2009 +0100
     1.2 +++ b/dbus/dbus.patch	Tue Jan 13 18:26:52 2009 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: dbus/dbus-internals.c
     1.5  --- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
     1.6  +++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
     1.7 -@@ -512,6 +512,14 @@
     1.8 +@@ -516,6 +516,14 @@
     1.9     uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
    1.10     
    1.11     _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
    1.12 @@ -27,7 +27,7 @@
    1.13   #include <stdlib.h>
    1.14   #include <string.h>
    1.15   #include <signal.h>
    1.16 -@@ -526,6 +527,8 @@
    1.17 +@@ -728,6 +729,8 @@
    1.18   #   else
    1.19   #       if defined(NAME_MAX)
    1.20   	 name_max = NAME_MAX;
    1.21 @@ -36,3 +36,39 @@
    1.22   #       else
    1.23   #           error "buffer size for readdir_r cannot be determined"
    1.24   #       endif
    1.25 +@@ -1233,4 +1236,4 @@
    1.26 +   _dbus_string_free (&cmdline);
    1.27 +   _dbus_string_free (&path);
    1.28 +   return FALSE;
    1.29 +-}
    1.30 +\ No newline at end of file
    1.31 ++}
    1.32 +Index: bus/config-parser-trivial.c
    1.33 +--- bus/config-parser-trivial.c.orig	2009-01-13 16:12:32.838078473 +0100
    1.34 ++++ bus/config-parser-trivial.c	2009-01-13 16:11:58.375810360 +0100
    1.35 +@@ -131,6 +131,25 @@
    1.36 + }
    1.37 + 
    1.38 + dbus_bool_t
    1.39 ++bus_config_parser_check_doctype (BusConfigParser   *parser,
    1.40 ++                                 const char        *doctype,
    1.41 ++                                 DBusError         *error)
    1.42 ++{
    1.43 ++  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
    1.44 ++
    1.45 ++  if (strcmp (doctype, "busconfig") != 0)
    1.46 ++    {
    1.47 ++      dbus_set_error (error,
    1.48 ++                      DBUS_ERROR_FAILED,
    1.49 ++                      "Configuration file has the wrong document type %s",
    1.50 ++                      doctype);
    1.51 ++      return FALSE;
    1.52 ++    }
    1.53 ++  else
    1.54 ++    return TRUE;
    1.55 ++}
    1.56 ++
    1.57 ++dbus_bool_t
    1.58 + bus_config_parser_start_element (BusConfigParser   *parser,
    1.59 +                                  const char        *element_name,
    1.60 +                                  const char       **attribute_names,

     2.1 --- a/dbus/dbus.spec	Mon Jan 12 19:09:19 2009 +0100
     2.2 +++ b/dbus/dbus.spec	Tue Jan 13 18:26:52 2009 +0100
     2.3 @@ -31,8 +31,8 @@
     2.4  Class:        EVAL
     2.5  Group:        RPC
     2.6  License:      AFL/GPL
     2.7 -Version:      1.1.1
     2.8 -Release:      20081126
     2.9 +Version:      1.2.12
    2.10 +Release:      20090106
    2.11  
    2.12  #   list of sources
    2.13  Source0:      http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
    2.14 @@ -68,40 +68,46 @@
    2.15      %setup -q
    2.16      %patch -p0
    2.17  
    2.18 -    #   adjust filesystem layout
    2.19 +    #   correct build configuration logic
    2.20      %{l_shtool} subst \
    2.21          -e 's;^\(cat[^|]*|\).*;\1 sed -e "s/\\(<listen>unix:tmpdir=\\)\[^<\]\*/\\1\\/tmp/" | \\;' \
    2.22          -e 's;#! /bin/bash;#!%{l_bash};' \
    2.23          tools/run-with-tmp-session-bus.sh
    2.24      %{l_shtool} subst \
    2.25          -e 's;/dbus-1\.0;;g' \
    2.26 +        -e 's;/dbus-1;;g' \
    2.27          -e 's;dbus-1;dbus;g' \
    2.28          -e 's;\(-I\${libdir}\).*;\1/dbus/include;g' \
    2.29 +        -e 's;\(-I\${includedir}\).*;\1/dbus;g' \
    2.30          dbus-1.pc.in
    2.31      %{l_shtool} subst \
    2.32 +        -e 's;/dbus-1\.0;;g' \
    2.33 +        dbus/Makefile.in
    2.34 +    %{l_shtool} subst \
    2.35          -e 's;-1\.la;.la;g' \
    2.36 -        test/name-test/Makefile.in dbus/Makefile.in tools/Makefile.in
    2.37 +        dbus/Makefile.in tools/Makefile.in
    2.38      %{l_shtool} subst \
    2.39 -        -e 's;/dbus-1\.0;;g' \
    2.40          -e 's;/dbus-1;;g' \
    2.41 -        dbus/Makefile.in tools/Makefile.in bus/Makefile.in bus/session.conf.in bus/dbus-daemon.1.in
    2.42 +        configure
    2.43 +    %{l_shtool} subst \
    2.44 +        -e 's;/*dbus-1;;g' \
    2.45 +        dbus/Makefile.in \
    2.46 +        tools/Makefile.in \
    2.47 +        bus/Makefile.in \
    2.48 +        bus/dbus-daemon.1.in \
    2.49 +        bus/config-parser.c \
    2.50 +        dbus/dbus-sysdeps-unix.c
    2.51      %{l_shtool} subst \
    2.52          -e 's;\(\$(localstatedir)/run\)/dbus;\1;g' \
    2.53          bus/Makefile.in
    2.54      %{l_shtool} subst \
    2.55          -e 's;^\(dbusarchincludedir *= *\$(libdir)\)\(/include/dbus\);\1/dbus\2;g' \
    2.56          dbus/Makefile.in
    2.57 -    %{l_shtool} subst \
    2.58 -        -e 's;^\(LIBTOOL=.\)[^\ ]*;\1/bin/sh;' \
    2.59 -        configure
    2.60  
    2.61      #   platform specific fixes
    2.62      case "%{l_platform -t}" in
    2.63          *-sunos* )
    2.64              %{l_shtool} subst \
    2.65 -                -e 's;readdir_r;__posix_readdir_r;' \
    2.66 -                dbus/dbus-sysdeps-util-unix.c
    2.67 -            %{l_shtool} subst \
    2.68                  -e 's;^\(Libs: -L\${libdir} -ldbus[^ ]*\);\1 -lsocket -lnsl;' \
    2.69                  dbus-1.pc.in
    2.70              ;;
    2.71 @@ -153,12 +159,18 @@
    2.72  %install
    2.73      #   install package
    2.74      rm -rf $RPM_BUILD_ROOT
    2.75 -    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    2.76 +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    2.77  
    2.78 -    #   strip down package
    2.79 +    #   strip binaries of symbols
    2.80      strip $RPM_BUILD_ROOT%{l_prefix}/lib/dbus/bin/* >/dev/null 2>&1 || true
    2.81 +    strip $RPM_BUILD_ROOT%{l_prefix}/libexec/dbus/bin/* >/dev/null 2>&1 || true
    2.82  
    2.83 -    #   install run-command script
    2.84 +    #   correct the installation hierarchy
    2.85 +    mv $RPM_BUILD_ROOT%{l_prefix}/share/man \
    2.86 +       $RPM_BUILD_ROOT%{l_prefix}/
    2.87 +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
    2.88 +
    2.89 +    #   install runcommand script
    2.90      %{l_shtool} mkdir -f -p -m 755 \
    2.91          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
    2.92      %{l_shtool} install -c -m 755 %{l_value -s -a} \