packages: ConsoleKit/ConsoleKit.spec - rel 9 - merge systemd stuff into mai...

[baggins]

Author: baggins                      Date: Sun Feb  5 15:54:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 9
- merge systemd stuff into main package

---- Files affected:
packages/ConsoleKit:
   ConsoleKit.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: packages/ConsoleKit/ConsoleKit.spec
diff -u packages/ConsoleKit/ConsoleKit.spec:1.47 packages/ConsoleKit/ConsoleKit.spec:1.48
--- packages/ConsoleKit/ConsoleKit.spec:1.47	Tue Jan 31 12:50:56 2012
+++ packages/ConsoleKit/ConsoleKit.spec	Sun Feb  5 16:54:43 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	ConsoleKit dla PolicyKit
 Name:		ConsoleKit
 Version:	0.4.5
-Release:	8
+Release:	9
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 Requires:	filesystem >= 3.0-25
 Requires:	glib2 >= 1:2.14.0
 Requires:	rc-scripts >= 0.4.3.0
+Requires:	systemd-units >= 37-0.10
+Obsoletes:	ConsoleKit-systemd
 Suggests:	udev-acl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -109,15 +111,6 @@
 %description x11 -l pl.UTF-8
 Narzędzia obsługujące sesje X11 dla pakietu ConsoleKit.
 
-%package systemd
-Summary:	systemd units for ConsoleKit
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-Requires:	systemd-units >= 37-0.10
-
-%description systemd
-systemd units for ConsoleKit.
-
 %prep
 %setup -q
 
@@ -161,15 +154,18 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post systemd
+%post
 %systemd_post console-kit-daemon.service
 
-%preun systemd
+%preun
 %systemd_preun console-kit-daemon.service
 
-%postun systemd
+%postun
 %systemd_reload
 
+%triggerpostun -- ConsoleKit < 0.4.5-9
+%systemd_trigger console-kit-daemon.service
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -194,6 +190,15 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/init/ck-log-system-stop.conf
 %{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
 %{_mandir}/man8/pam_ck_connector.8*
+%{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
 
 %files libs
 %defattr(644,root,root,755)
@@ -231,24 +236,16 @@
 %attr(755,root,root) %{_libdir}/ck-get-x11-server-pid
 %attr(755,root,root) %{_libdir}/ck-get-x11-display-device
 
-%files systemd
-%defattr(644,root,root,755)
-%{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
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2012/02/05 15:54:43  baggins
+- rel 9
+- merge systemd stuff into main package
+
 Revision 1.47  2012/01/31 11:50:56  baggins
 - release 8
 
================================================================

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