diff -r b3a835aa617c -r 11e79e472059 dbus/dbus.spec
--- a/dbus/dbus.spec	Mon Jan 12 19:09:19 2009 +0100
+++ b/dbus/dbus.spec	Tue Jan 13 18:26:52 2009 +0100
@@ -31,8 +31,8 @@
 Class:        EVAL
 Group:        RPC
 License:      AFL/GPL
-Version:      1.1.1
-Release:      20081126
+Version:      1.2.12
+Release:      20090106
 
 #   list of sources
 Source0:      http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
@@ -68,40 +68,46 @@
     %setup -q
     %patch -p0
 
-    #   adjust filesystem layout
+    #   correct build configuration logic
     %{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;;g' \
         -e 's;dbus-1;dbus;g' \
         -e 's;\(-I\${libdir}\).*;\1/dbus/include;g' \
+        -e 's;\(-I\${includedir}\).*;\1/dbus;g' \
         dbus-1.pc.in
     %{l_shtool} subst \
+        -e 's;/dbus-1\.0;;g' \
+        dbus/Makefile.in
+    %{l_shtool} subst \
         -e 's;-1\.la;.la;g' \
-        test/name-test/Makefile.in dbus/Makefile.in tools/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
+        configure
+    %{l_shtool} subst \
+        -e 's;/*dbus-1;;g' \
+        dbus/Makefile.in \
+        tools/Makefile.in \
+        bus/Makefile.in \
+        bus/dbus-daemon.1.in \
+        bus/config-parser.c \
+        dbus/dbus-sysdeps-unix.c
     %{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
             ;;
@@ -153,12 +159,18 @@
 %install
     #   install package
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
-    #   strip down package
+    #   strip binaries of symbols
     strip $RPM_BUILD_ROOT%{l_prefix}/lib/dbus/bin/* >/dev/null 2>&1 || true
+    strip $RPM_BUILD_ROOT%{l_prefix}/libexec/dbus/bin/* >/dev/null 2>&1 || true
 
-    #   install run-command script
+    #   correct the installation hierarchy
+    mv $RPM_BUILD_ROOT%{l_prefix}/share/man \
+       $RPM_BUILD_ROOT%{l_prefix}/
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
+
+    #   install runcommand script
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 %{l_value -s -a} \