- allow GetSessions in dbus policy

[packages/ConsoleKit.git] / ConsoleKit.spec

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index ea21cd9c3ba36251d5b2d98c6c2dec155bdfc224..0e6bad5ff20d7537111851e977a1c25380a76338 100644 (file)
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -1,17 +1,19 @@
 Summary:       ConsoleKit for PolicyKit
 Summary(pl.UTF-8):     ConsoleKit dla PolicyKit
 Name:          ConsoleKit
-Version:       0.2.3
-Release:       1
+Version:       0.3.0
+Release:       4
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://people.freedesktop.org/~mccann/dist/%{name}-%{version}.tar.gz
-# Source0-md5: dc4b3194ec583b03747ffc909a5571da
-Source1:       %{name}.init
+Source0:       http://people.freedesktop.org/~mccann/dist/%{name}-%{version}.tar.bz2
+# Source0-md5: 43b02a52212330b54cfb34c4044d9ce0
+Patch0:                %{name}-dbus.patch
 URL:           http://www.freedesktop.org/wiki/Software/ConsoleKit
+BuildRequires: PolicyKit-devel >= 0.7
 BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.7
+BuildRequires: automake >= 1:1.9
 BuildRequires: dbus-glib-devel >= 0.30
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.8.0
 # for <sys/inotify.h>
 BuildRequires: glibc-devel >= 6:2.4
@@ -21,6 +23,7 @@ BuildRequires:        pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: xmlto
 BuildRequires: xorg-lib-libX11-devel >= 1.0.0
+BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      dbus-glib >= 0.30
@@ -80,6 +83,7 @@ Statyczna biblioteka ConsoleKit.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -92,7 +96,7 @@ Statyczna biblioteka ConsoleKit.
        --enable-docbook-docs \
        --enable-static \
        --with-pam-module-dir=/%{_lib}/security \
-       --with-pid-file=/var/run/console-kit-daemon.pid
+       --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid
 %{__make} -j1
 
 %install
@@ -101,22 +105,15 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ConsoleKit
-
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add ConsoleKit
-%service ConsoleKit restart
-
-%preun
-if [ "$1" = "0" ]; then
-       %service -q ConsoleKit stop
-       /sbin/chkconfig --del ConsoleKit
-fi
+# use triggerun not triggerpostun - old init script is needed to stop service
+%triggerun -- ConsoleKit < 0.2.4
+%service -q ConsoleKit stop
+/sbin/chkconfig --del ConsoleKit
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -124,22 +121,39 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_bindir}/ck-history
+%attr(755,root,root) %{_bindir}/ck-launch-session
 %attr(755,root,root) %{_bindir}/ck-list-sessions
+%attr(755,root,root) %{_sbindir}/ck-log-system-restart
+%attr(755,root,root) %{_sbindir}/ck-log-system-start
+%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
+%dir %{_prefix}/lib/ConsoleKit
+%dir %{_prefix}/lib/ConsoleKit/run-session.d
+%dir %{_prefix}/lib/ConsoleKit/scripts
+%attr(755,root,root) %{_prefix}/lib/ConsoleKit/scripts/*
 %attr(755,root,root) /%{_lib}/security/pam_ck_connector.so
+%{_datadir}/PolicyKit/policy/org.freedesktop.consolekit.policy
+%{_datadir}/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+%{_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
 %dir %{_sysconfdir}/ConsoleKit
+%dir %{_sysconfdir}/ConsoleKit/run-session.d
 %dir %{_sysconfdir}/ConsoleKit/seats.d
 %{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
-%attr(754,root,root) /etc/rc.d/init.d/*
-%{_mandir}/man8/pam_ck_connector*
+%{_mandir}/man8/pam_ck_connector.8*
+%dir %{_localstatedir}/run/ConsoleKit
+%dir %{_localstatedir}/log/ConsoleKit
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libck-connector.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libck-connector.so.0
 
 %files devel
 %defattr(644,root,root,755)