packages: ConsoleKit/ConsoleKit.spec - mv to new rpm macros, add post, preun...

[cactus]

Author: cactus                       Date: Sun Dec  4 01:41:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mv to new rpm macros, add post,preun,postun actions

---- Files affected:
packages/ConsoleKit:
   ConsoleKit.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: packages/ConsoleKit/ConsoleKit.spec
diff -u packages/ConsoleKit/ConsoleKit.spec:1.42 packages/ConsoleKit/ConsoleKit.spec:1.43
--- packages/ConsoleKit/ConsoleKit.spec:1.42	Sun Nov 27 11:27:00 2011
+++ packages/ConsoleKit/ConsoleKit.spec	Sun Dec  4 02:41:08 2011
@@ -18,7 +18,7 @@
 BuildRequires:	pam-devel >= 0.80
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.92
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.623
 BuildRequires:	xmlto
 BuildRequires:	xorg-lib-libX11-devel >= 1.0.0
 BuildRequires:	zlib-devel
@@ -127,7 +127,7 @@
 	--enable-static \
 	--with-pam-module-dir=/%{_lib}/security \
 	--with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid \
-	--with-systemdsystemunitdir=/lib/systemd/system
+	--with-systemdsystemunitdir=%{systemdunitdir}
 
 %{__make} -j1
 
@@ -155,6 +155,15 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%post systemd
+%systemd_post
+
+%postun systemd
+%systemd_postun console-kit-daemon.service
+
+%preun systemd
+%systemd_preun console-kit-daemon.service
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -217,15 +226,15 @@
 
 %files systemd
 %defattr(644,root,root,755)
-/lib/systemd/system/basic.target.wants/console-kit-log-system-start.service
-/lib/systemd/system/console-kit-daemon.service
-/lib/systemd/system/console-kit-log-system-restart.service
-/lib/systemd/system/console-kit-log-system-start.service
-/lib/systemd/system/console-kit-log-system-stop.service
-/lib/systemd/system/halt.target.wants/console-kit-log-system-stop.service
-/lib/systemd/system/kexec.target.wants/console-kit-log-system-restart.service
-/lib/systemd/system/poweroff.target.wants/console-kit-log-system-stop.service
-/lib/systemd/system/reboot.target.wants/console-kit-log-system-restart.service
+%{systemdunitdir}/basic.target.wants/console-kit-log-system-start.service
+%{systemdunitdir}/console-kit-daemon.service
+%{systemdunitdir}/console-kit-log-system-restart.service
+%{systemdunitdir}/console-kit-log-system-start.service
+%{systemdunitdir}/console-kit-log-system-stop.service
+%{systemdunitdir}/halt.target.wants/console-kit-log-system-stop.service
+%{systemdunitdir}/kexec.target.wants/console-kit-log-system-restart.service
+%{systemdunitdir}/poweroff.target.wants/console-kit-log-system-stop.service
+%{systemdunitdir}/reboot.target.wants/console-kit-log-system-restart.service
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -233,6 +242,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2011/12/04 01:41:08  cactus
+- mv to new rpm macros, add post,preun,postun actions
+
 Revision 1.42  2011/11/27 10:27:00  wiget
 - package systemd files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ConsoleKit/ConsoleKit.spec?r1=1.42&r2=1.43&f=u