packages: dbus/dbus.spec - use systemd macros - reload systemd in %post(un)...

[wiget]

Author: wiget                        Date: Sun Dec  4 18:27:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use systemd macros
- reload systemd in %post(un)
- rel. 3

---- Files affected:
packages/dbus:
   dbus.spec (1.223 -> 1.224) 

---- Diffs:

================================================================
Index: packages/dbus/dbus.spec
diff -u packages/dbus/dbus.spec:1.223 packages/dbus/dbus.spec:1.224
--- packages/dbus/dbus.spec:1.223	Sun Nov 27 23:23:02 2011
+++ packages/dbus/dbus.spec	Sun Dec  4 19:27:37 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
 Version:	1.4.16
-Release:	2
+Release:	3
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -34,7 +34,7 @@
 BuildRequires:	libtool >= 2:2.0
 BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.561
+BuildRequires:	rpmbuild(macros) >= 1.626
 BuildRequires:	sed >= 4.0
 BuildRequires:	xmlto
 %{?with_X11:BuildRequires:	xorg-lib-libX11-devel}
@@ -72,6 +72,7 @@
 Summary:	systemd units for system message bus
 Group:		Daemons
 Requires:	%{name} = %{version}-%{release}
+Requires:	systemd-units >= 37-0.10
 
 %description systemd
 systemd units for system message bus.
@@ -174,7 +175,7 @@
 	--with-session-socket-dir=/tmp \
 	--with-system-pid-file=%{_localstatedir}/run/dbus.pid \
 	--with-xml=expat \
-	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
 	%{!?with_X11:--without-x}
 %{__make}
 
@@ -199,7 +200,7 @@
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libdbus-1.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libdbus-1.so
 
-ln -s dbus.service $RPM_BUILD_ROOT/lib/systemd/system/messagebus.service
+ln -s dbus.service $RPM_BUILD_ROOT%{systemdunitdir}/messagebus.service
 
 %{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/dbus/api
 
@@ -234,6 +235,12 @@
 %upstart_postun messagebus
 %endif
 
+%post systemd
+%systemd_reload
+
+%postun systemd
+%systemd_reload
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
@@ -277,12 +284,12 @@
 
 %files systemd
 %defattr(644,root,root,755)
-/lib/systemd/system/dbus.service
-/lib/systemd/system/dbus.socket
-/lib/systemd/system/dbus.target.wants/dbus.socket
-/lib/systemd/system/messagebus.service
-/lib/systemd/system/multi-user.target.wants/dbus.service
-/lib/systemd/system/sockets.target.wants/dbus.socket
+%{systemdunitdir}/dbus.service
+%{systemdunitdir}/dbus.socket
+%{systemdunitdir}/dbus.target.wants/dbus.socket
+%{systemdunitdir}/messagebus.service
+%{systemdunitdir}/multi-user.target.wants/dbus.service
+%{systemdunitdir}/sockets.target.wants/dbus.socket
 
 %if "%{pld_release}" != "ti"
 %files upstart
@@ -328,6 +335,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.224  2011/12/04 18:27:37  wiget
+- use systemd macros
+- reload systemd in %post(un)
+- rel. 3
+
 Revision 1.223  2011/11/27 22:23:02  cactus
 - rm -f for api
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/dbus.spec?r1=1.223&r2=1.224&f=u