1.1 --- a/dbus/dbus.spec Mon Jan 12 19:09:19 2009 +0100
1.2 +++ b/dbus/dbus.spec Tue Jan 13 18:26:52 2009 +0100
1.3 @@ -31,8 +31,8 @@
1.4 Class: EVAL
1.5 Group: RPC
1.6 License: AFL/GPL
1.7 -Version: 1.1.1
1.8 -Release: 20081126
1.9 +Version: 1.2.12
1.10 +Release: 20090106
1.11
1.12 # list of sources
1.13 Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
1.14 @@ -68,40 +68,46 @@
1.15 %setup -q
1.16 %patch -p0
1.17
1.18 - # adjust filesystem layout
1.19 + # correct build configuration logic
1.20 %{l_shtool} subst \
1.21 -e 's;^\(cat[^|]*|\).*;\1 sed -e "s/\\(<listen>unix:tmpdir=\\)\[^<\]\*/\\1\\/tmp/" | \\;' \
1.22 -e 's;#! /bin/bash;#!%{l_bash};' \
1.23 tools/run-with-tmp-session-bus.sh
1.24 %{l_shtool} subst \
1.25 -e 's;/dbus-1\.0;;g' \
1.26 + -e 's;/dbus-1;;g' \
1.27 -e 's;dbus-1;dbus;g' \
1.28 -e 's;\(-I\${libdir}\).*;\1/dbus/include;g' \
1.29 + -e 's;\(-I\${includedir}\).*;\1/dbus;g' \
1.30 dbus-1.pc.in
1.31 %{l_shtool} subst \
1.32 + -e 's;/dbus-1\.0;;g' \
1.33 + dbus/Makefile.in
1.34 + %{l_shtool} subst \
1.35 -e 's;-1\.la;.la;g' \
1.36 - test/name-test/Makefile.in dbus/Makefile.in tools/Makefile.in
1.37 + dbus/Makefile.in tools/Makefile.in
1.38 %{l_shtool} subst \
1.39 - -e 's;/dbus-1\.0;;g' \
1.40 -e 's;/dbus-1;;g' \
1.41 - dbus/Makefile.in tools/Makefile.in bus/Makefile.in bus/session.conf.in bus/dbus-daemon.1.in
1.42 + configure
1.43 + %{l_shtool} subst \
1.44 + -e 's;/*dbus-1;;g' \
1.45 + dbus/Makefile.in \
1.46 + tools/Makefile.in \
1.47 + bus/Makefile.in \
1.48 + bus/dbus-daemon.1.in \
1.49 + bus/config-parser.c \
1.50 + dbus/dbus-sysdeps-unix.c
1.51 %{l_shtool} subst \
1.52 -e 's;\(\$(localstatedir)/run\)/dbus;\1;g' \
1.53 bus/Makefile.in
1.54 %{l_shtool} subst \
1.55 -e 's;^\(dbusarchincludedir *= *\$(libdir)\)\(/include/dbus\);\1/dbus\2;g' \
1.56 dbus/Makefile.in
1.57 - %{l_shtool} subst \
1.58 - -e 's;^\(LIBTOOL=.\)[^\ ]*;\1/bin/sh;' \
1.59 - configure
1.60
1.61 # platform specific fixes
1.62 case "%{l_platform -t}" in
1.63 *-sunos* )
1.64 %{l_shtool} subst \
1.65 - -e 's;readdir_r;__posix_readdir_r;' \
1.66 - dbus/dbus-sysdeps-util-unix.c
1.67 - %{l_shtool} subst \
1.68 -e 's;^\(Libs: -L\${libdir} -ldbus[^ ]*\);\1 -lsocket -lnsl;' \
1.69 dbus-1.pc.in
1.70 ;;
1.71 @@ -153,12 +159,18 @@
1.72 %install
1.73 # install package
1.74 rm -rf $RPM_BUILD_ROOT
1.75 - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
1.76 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.77
1.78 - # strip down package
1.79 + # strip binaries of symbols
1.80 strip $RPM_BUILD_ROOT%{l_prefix}/lib/dbus/bin/* >/dev/null 2>&1 || true
1.81 + strip $RPM_BUILD_ROOT%{l_prefix}/libexec/dbus/bin/* >/dev/null 2>&1 || true
1.82
1.83 - # install run-command script
1.84 + # correct the installation hierarchy
1.85 + mv $RPM_BUILD_ROOT%{l_prefix}/share/man \
1.86 + $RPM_BUILD_ROOT%{l_prefix}/
1.87 + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
1.88 +
1.89 + # install runcommand script
1.90 %{l_shtool} mkdir -f -p -m 755 \
1.91 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
1.92 %{l_shtool} install -c -m 755 %{l_value -s -a} \
