X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ConsoleKit.spec;h=a7c4422e61adf557d77a6e6ecb6aedbb2eed93f1;hb=69cc6d5c1f341b1fd483a3ad337c889aecef26aa;hp=63b7797244d0bab0750218772ef2c2f146ad2ae8;hpb=7309441a6ced83fd678cc037e01b3b9767c4ede2;p=packages%2FConsoleKit.git

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index 63b7797..a7c4422 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -2,7 +2,7 @@ Summary:	ConsoleKit for PolicyKit
 Summary(pl.UTF-8):	ConsoleKit dla PolicyKit
 Name:		ConsoleKit
 Version:	0.4.5
-Release:	1
+Release:	5
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
@@ -17,7 +17,7 @@ BuildRequires:	glibc-devel >= 6:2.4
 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
@@ -27,8 +27,7 @@ Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-glib >= 0.82
 Requires:	filesystem >= 3.0-25
 Requires:	glib2 >= 1:2.14.0
-Requires:	rc-scripts
-Requires:	xorg-lib-libX11 >= 1.0.0
+Requires:	rc-scripts >= 0.4.3.0
 Suggests:	udev-acl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,6 +93,28 @@ Static ConsoleKit library.
 %description static -l pl.UTF-8
 Statyczna biblioteka ConsoleKit.
 
+%package x11
+Summary:	X11 session support for ConsoleKit
+Summary(pl.UTF-8):	Obsługa sesji X11 dla pakietu ConsoleKit
+License:	GPL v2+
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	xorg-lib-libX11 >= 1.0.0
+
+%description x11
+X11 session support utilities for ConsoleKit.
+
+%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}
+
+%description systemd
+systemd units for ConsoleKit.
+
 %prep
 %setup -q
 
@@ -104,17 +125,23 @@ Statyczna biblioteka ConsoleKit.
 	--enable-pam-module \
 	--enable-static \
 	--with-pam-module-dir=/%{_lib}/security \
-	--with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid
+	--with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid \
+	--with-systemdsystemunitdir=%{systemdunitdir}
 
 %{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
+# The sample upstart files are good enough for us.
+install -d $RPM_BUILD_ROOT/etc/init
+for a in ck-log-system-{start,stop,restart}; do
+	cp -p data/$a $RPM_BUILD_ROOT/etc/init/$a.conf
+done
+
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -127,6 +154,15 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -138,8 +174,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/ck-log-system-stop
 %attr(755,root,root) %{_sbindir}/console-kit-daemon
 %attr(755,root,root) %{_libdir}/ck-collect-session-info
-%attr(755,root,root) %{_libdir}/ck-get-x11-server-pid
-%attr(755,root,root) %{_libdir}/ck-get-x11-display-device
 %attr(755,root,root) %{_prefix}/lib/ConsoleKit/scripts/*
 %attr(755,root,root) /%{_lib}/security/pam_ck_connector.so
 %{_datadir}/polkit-1/actions/org.freedesktop.consolekit.policy
@@ -147,7 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
-%{_sysconfdir}/dbus-1/system.d/ConsoleKit.conf
+/etc/dbus-1/system.d/ConsoleKit.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/ck-log-system-restart.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/ck-log-system-start.conf
+%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*
 
@@ -180,3 +217,20 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libck-connector.a
+
+%files x11
+%defattr(644,root,root,755)
+%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