upgrading package: dbus 1.1.1 -> 1.2.16

dbus/dbus.patch

@@ -1,7 +1,30 @@
+Index: bus/Makefile.in
+--- bus/Makefile.in.orig	2009-07-14 21:43:06 +0200
++++ bus/Makefile.in	2010-01-05 16:19:40 +0100
+@@ -351,8 +351,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PIC_CFLAGS = @PIC_CFLAGS@
+ PIC_LDFLAGS = @PIC_LDFLAGS@
+-PIE_CFLAGS = @PIE_CFLAGS@
+-PIE_LDFLAGS = @PIE_LDFLAGS@
++PIE_CFLAGS =
++PIE_LDFLAGS =
+ PKG_CONFIG = @PKG_CONFIG@
+ RANLIB = @RANLIB@
+ R_DYNAMIC_LDFLAG = @R_DYNAMIC_LDFLAG@
+@@ -500,7 +500,7 @@
+ 	$(DBUS_BUS_LIBS)				\
+ 	$(top_builddir)/dbus/libdbus-convenience.la
+ 
+-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+ 	$(XML_SOURCES)				\
+ 	config-parser-common.c			\
 Index: dbus/dbus-internals.c
---- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
-+++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
-@@ -512,6 +512,14 @@
+--- dbus/dbus-internals.c.orig	2009-07-14 21:39:47 +0200
++++ dbus/dbus-internals.c	2010-01-05 16:18:36 +0100
+@@ -516,6 +516,14 @@
    uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
    
    _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
@@ -17,8 +40,8 @@ Index: dbus/dbus-internals.c
  
  /**
 Index: dbus/dbus-sysdeps-util-unix.c
---- dbus/dbus-sysdeps-util-unix.c.orig	2006-11-02 20:19:08 +0100
-+++ dbus/dbus-sysdeps-util-unix.c	2006-11-18 12:33:22 +0100
+--- dbus/dbus-sysdeps-util-unix.c.orig	2009-07-14 21:39:47 +0200
++++ dbus/dbus-sysdeps-util-unix.c	2010-01-05 16:18:36 +0100
 @@ -31,6 +31,7 @@
  #include "dbus-test.h"
  
@@ -27,7 +50,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
  #include <stdlib.h>
  #include <string.h>
  #include <signal.h>
-@@ -526,6 +527,8 @@
+@@ -728,6 +729,8 @@
  #   else
  #       if defined(NAME_MAX)
  	 name_max = NAME_MAX;

dbus/dbus.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        RPC
 License:      AFL/GPL
-Version:      1.1.1
-Release:      20080101
+Version:      1.2.16
+Release:      20100105
 
 #   list of sources
 Source0:      http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
@@ -44,8 +44,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, pkgconfig, gcc
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  libxml
-PreReq:       libxml
+BuildPreReq:  expat
+PreReq:       expat
 AutoReq:      no
 AutoReqProv:  no
 
@@ -68,61 +68,23 @@ AutoReqProv:  no
     %setup -q
     %patch -p0
 
-    #   adjust filesystem layout
+%build
+    #   configure package
     %{l_shtool} subst \
         -e 's;^\(cat[^|]*|\).*;\1 sed -e "s/\\(<listen>unix:tmpdir=\\)\[^<\]\*/\\1\\/tmp/" | \\;' \
         -e 's;#! /bin/bash;#!%{l_bash};' \
         tools/run-with-tmp-session-bus.sh
-    %{l_shtool} subst \
-        -e 's;/dbus-1\.0;;g' \
-        -e 's;dbus-1;dbus;g' \
-        -e 's;\(-I\${libdir}\).*;\1/dbus/include;g' \
-        dbus-1.pc.in
-    %{l_shtool} subst \
-        -e 's;-1\.la;.la;g' \
-        test/name-test/Makefile.in dbus/Makefile.in tools/Makefile.in
-    %{l_shtool} subst \
-        -e 's;/dbus-1\.0;;g' \
-        -e 's;/dbus-1;;g' \
-        dbus/Makefile.in tools/Makefile.in bus/Makefile.in bus/session.conf.in bus/dbus-daemon.1.in
-    %{l_shtool} subst \
-        -e 's;\(\$(localstatedir)/run\)/dbus;\1;g' \
-        bus/Makefile.in
-    %{l_shtool} subst \
-        -e 's;^\(dbusarchincludedir *= *\$(libdir)\)\(/include/dbus\);\1/dbus\2;g' \
-        dbus/Makefile.in
-    %{l_shtool} subst \
-        -e 's;^\(LIBTOOL=.\)[^\ ]*;\1/bin/sh;' \
-        configure
-
-    #   platform specific fixes
-    case "%{l_platform -t}" in
-        *-sunos* )
-            %{l_shtool} subst \
-                -e 's;readdir_r;__posix_readdir_r;' \
-                dbus/dbus-sysdeps-util-unix.c
-            %{l_shtool} subst \
-                -e 's;^\(Libs: -L\${libdir} -ldbus[^ ]*\);\1 -lsocket -lnsl;' \
-                dbus-1.pc.in
-            ;;
-    esac
-
-%build
-    #   configure package
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O} -pthread" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags} -pthread" \
     ./configure \
         --prefix=%{l_prefix} \
+        --mandir=%{l_prefix}/man \
         --datadir=%{l_prefix}/share/dbus \
         --sysconfdir=%{l_prefix}/etc/dbus \
         --localstatedir=%{l_prefix}/var/dbus \
         --without-x \
-        --disable-qt \
-        --disable-qt3 \
-        --disable-glib \
-        --disable-gtk \
         --disable-tests \
         --disable-ansi \
         --disable-verbose-mode \
@@ -132,14 +94,10 @@ AutoReqProv:  no
         --disable-doxygen-docs \
         --disable-gcov \
         --disable-abstract-sockets \
-        --disable-gcj \
-        --disable-mono \
-        --disable-mono-docs \
-        --disable-python \
         --disable-selinux \
         --disable-dnotify \
         --disable-shared \
-        --with-xml=libxml \
+        --with-xml=expat \
         --with-session-socket-dir=%{l_prefix}/var/dbus/run \
         --with-system-pid-file=%{l_prefix}/var/dbus/run/dbus.pid \
         --with-system-socket=%{l_prefix}/var/dbus/run/dbus.socket \