- move session dir to filesystem

[packages/ConsoleKit2.git] / ConsoleKit.spec

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index 90a5e32025022dff8764fb684da9e52b94c7cbe3..a887b7d9c957ae32031cc724b748b7c723230f2f 100644 (file)
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -1,36 +1,35 @@
-# TODO:
-# - generally check all
-%define        snap    20070314
 Summary:       ConsoleKit for PolicyKit
 Summary(pl.UTF-8):     ConsoleKit dla PolicyKit
 Name:          ConsoleKit
-Version:       0.1.3
-Release:       0.%{snap}.1
-License:       GPL v2
+Version:       0.3.0
+Release:       5
+License:       GPL v2+
 Group:         Libraries
-Source0:       %{name}-%{snap}.tar.bz2
-# Source0-md5: b4f5ce06f5d137ea559afc0461c58a73
-Source1:       %{name}.init
-Patch0:                %{name}-pam64.patch
-URL:           http://webcvs.freedesktop.org/hal/
-BuildRequires: PolicyKit-devel
-BuildRequires: autoconf >= 2.54
-BuildRequires: automake >= 1:1.7
+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.9
 BuildRequires: dbus-glib-devel >= 0.30
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.8.0
-BuildRequires: gtk-doc >= 1.3
-BuildRequires: gtk+2-devel >= 2:2.8.0
+# for <sys/inotify.h>
+BuildRequires: glibc-devel >= 6:2.4
 BuildRequires: libtool >= 1.4
 BuildRequires: pam-devel >= 0.80
 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:      PolicyKit
 Requires:      dbus-glib >= 0.30
 Requires:      glib2 >= 1:2.8.0
 Requires:      rc-scripts
+Requires:      xorg-lib-libX11 >= 1.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,8 +37,8 @@ ConsoleKit is a framework for defining and tracking users, login
 sessions, and seats.
 
 %description -l pl.UTF-8
-ConsoleKit to szkielet do definiowania i śledzenia użytkowników,
-sesji logowania i siedzib.
+ConsoleKit to szkielet do definiowania i śledzenia użytkowników, sesji
+logowania i siedzib.
 
 %package libs
 Summary:       ConsoleKit library
@@ -83,10 +82,8 @@ Static ConsoleKit library.
 Statyczna biblioteka ConsoleKit.
 
 %prep
-%setup -q -n %{name}-%{snap}
-%ifarch %{x8664}
+%setup -q
 %patch0 -p1
-%endif
 
 %build
 %{__libtoolize}
@@ -96,8 +93,11 @@ Statyczna biblioteka ConsoleKit.
 %{__automake}
 %configure \
        --enable-pam-module \
-       --enable-docbook-docs
-%{__make}
+       --enable-docbook-docs \
+       --enable-static \
+       --with-pam-module-dir=/%{_lib}/security \
+       --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -105,43 +105,57 @@ 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
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
+%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/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
-%attr(754,root,root) /etc/rc.d/init.d/*
-%{_mandir}/man8/pam_ck_connector*
+%dir %{_sysconfdir}/ConsoleKit
+%dir %{_sysconfdir}/ConsoleKit/run-session.d
+%dir %{_sysconfdir}/ConsoleKit/seats.d
+%{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
+%{_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)
-%attr(755,root,root) %{_libdir}/libck-connector*.so
+%attr(755,root,root) %{_libdir}/libck-connector.so
 %{_libdir}/libck-connector.la
 %dir %{_includedir}/ConsoleKit
 %dir %{_includedir}/ConsoleKit/ck-connector