X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ConsoleKit.spec;h=c629390202bf257ad6935cdc359cf898fe81e95a;hb=6d014f9960647c56a494263a621321d8211a700c;hp=bb5225ef80cdb372e9c4ce46672e0814bd09034e;hpb=d885d4ae37a8bfd0f49acb8b7c44018f29814726;p=packages%2FConsoleKit.git

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index bb5225e..c629390 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -1,34 +1,42 @@
 Summary:	ConsoleKit for PolicyKit
 Summary(pl.UTF-8):	ConsoleKit dla PolicyKit
 Name:		ConsoleKit
-Version:	0.4.5
-Release:	6
+Version:	0.4.6
+Release:	1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
-# Source0-md5:	f2657f93761206922d558471a936fbc3
+Source0:	http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.xz
+# Source0-md5:	611792b4d616253a5bdec9175f8b7678
+Source1:	%{name}.tmpfiles
 URL:		http://www.freedesktop.org/wiki/Software/ConsoleKit
 BuildRequires:	dbus-glib-devel >= 0.82
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.14.0
+BuildRequires:	glib2-devel >= 1:2.22.0
 # for <sys/inotify.h>
 BuildRequires:	glibc-devel >= 6:2.4
+BuildRequires:	udev-devel
 BuildRequires:	pam-devel >= 0.80
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.92
 BuildRequires:	rpmbuild(macros) >= 1.626
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xmlto
 BuildRequires:	xorg-lib-libX11-devel >= 1.0.0
+BuildRequires:	xz
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-glib >= 0.82
 Requires:	filesystem >= 3.0-25
 Requires:	glib2 >= 1:2.14.0
 Requires:	rc-scripts >= 0.4.3.0
-Suggests:	udev-acl
+Requires:	systemd-units >= 38
+Provides:	udev-acl = 1:182-1
+Obsoletes:	ConsoleKit-systemd
+Obsoletes:	udev-acl < 1:182
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -107,19 +115,14 @@ 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}
-Requires:	systemd-units >= 37-0.10
-
-%description systemd
-systemd units for ConsoleKit.
-
 %prep
 %setup -q
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
 	--disable-silent-rules \
 	--enable-docbook-docs \
@@ -127,12 +130,15 @@ systemd units for ConsoleKit.
 	--enable-static \
 	--with-pam-module-dir=/%{_lib}/security \
 	--with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid \
-	--with-systemdsystemunitdir=%{systemdunitdir}
+	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--enable-udev-acl
 
 %{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -142,6 +148,8 @@ for a in ck-log-system-{start,stop,restart}; do
 	cp -p data/$a $RPM_BUILD_ROOT/etc/init/$a.conf
 done
 
+install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
 
 %clean
@@ -155,15 +163,18 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -188,7 +199,20 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
+%attr(755,root,root) /lib/udev/udev-acl
+%attr(755,root,root) /usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
+/lib/udev/rules.d/70-udev-acl.rules
+ 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libck-connector.so.*.*.*
@@ -196,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dirs
 %defattr(644,root,root,755)
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %{_sysconfdir}/ConsoleKit
 %dir %{_sysconfdir}/ConsoleKit/run-session.d
 %dir %{_sysconfdir}/ConsoleKit/run-seat.d
@@ -223,15 +248,3 @@ rm -rf $RPM_BUILD_ROOT
 %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