git snapshot with systemd activation

.cvsignore

@@ -1 +1 @@
-dbus-1.3.1.tar.gz
+dbus-1.3.2.885483.tar.gz

dbus.spec

@@ -6,14 +6,16 @@
 %define dbus_user_uid           81
 %define _default_patch_fuzz     999
 
+%define githash .885483
+
 Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
-Version: 1.3.1
+Version: 1.3.2
-Release: 1%{?dist}
+Release: 0.0%{?githash}%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 #VCS: git:git://git.freedesktop.org/git/dbus/dbus
-Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
+Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}%{?githash}.tar.gz
 Source1: doxygen_to_devhelp.xsl
 Source2: 00-start-message-bus.sh
 License: GPLv2+ or AFL
@@ -34,6 +36,7 @@ BuildRequires: libxslt
 Requires: chkconfig >= 1.3.26
 Requires: libselinux >= %{libselinux_version}
 Requires: dbus-libs = %{epoch}:%{version}-%{release}
+Requires: systemd-units
 Requires(pre): /usr/sbin/useradd
 
 # Conflict with cups prior to configuration file change, so that the
@@ -89,7 +92,7 @@ D-BUS contains some tools that require Xlib to be installed, those are
 in this separate package so server systems need not install X.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 # For some reason upstream ships these files as executable
 # Make sure they are not
@@ -105,7 +108,7 @@ COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat -
 
 # leave verbose mode so people can debug their apps but make sure to
 # turn it off on stable releases with --disable-verbose-mode
-%configure $COMMON_ARGS --disable-tests --disable-asserts --enable-doxygen-docs --enable-xml-docs
+%configure $COMMON_ARGS --disable-tests --disable-asserts --enable-doxygen-docs --enable-xml-docs --with-systemdsystemunitdir=/lib/systemd/system/
 make
 
 doxygen Doxyfile
@@ -148,6 +151,11 @@ install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-st
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
 
+# Make sure that when somebody asks for D-Bus under the name of the
+# old SysV script, that he ends up with the standard dbus.service name
+# now.
+ln -s dbus.service %{buildroot}/lib/systemd/system/messagebus.service
+
 ## %find_lang %{gettext_package}
 
 %clean
@@ -164,11 +172,13 @@ rm -rf %{buildroot}
 %post
 /sbin/chkconfig --add messagebus
 /sbin/chkconfig messagebus resetpriorities
+/usr/bin/systemd-install --realize=reload enable dbus.service >/dev/null 2>&1 || :
 
 %preun
 if [ $1 = 0 ]; then
     /sbin/service messagebus stop
     /sbin/chkconfig --del messagebus
+    /usr/bin/systemd-install --realize=reload disable dbus.service >/dev/null 2>&1 || :
 fi
 
 %postun libs -p /sbin/ldconfig
@@ -204,7 +214,10 @@ fi
 # See doc/system-activation.txt in source tarball for the rationale
 # behind these permissions
 %attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper
-
+/lib/systemd/system/dbus.service
+/lib/systemd/system/dbus.socket
+/lib/systemd/system/dbus.target.wants/dbus.socket
+/lib/systemd/system/messagebus.service
 
 %files libs
 %defattr(-,root,root,-)
@@ -232,6 +245,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Jul 9 2010 Lennart Poettering <lpoetter@redhat.com> - 1:1.3.2-0.0.885483
+- git Snapshot with systemd activation
+
 * Wed Jun 23 2010 Lennart Poettering <lpoetter@redhat.com> - 1:1.3.1-1
 - New upstream release
 
@@ -926,4 +942,3 @@ uint16's in the python bindings
 
 * Mon Mar 31 2003 Havoc Pennington <hp@redhat.com> 0.6.90-1
 - initial build
-

sources

@@ -1 +1 @@
-1aab02bdcac4d662d3760896790f0ede  dbus-1.3.1.tar.gz
+44f39ff84282728bf65bdad31461a973  dbus-1.3.2.885483.tar.gz