- better -x11 description

[packages/ConsoleKit.git] / ConsoleKit.spec

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index 1357ab01143597875582d7e8725d49c918986cad..cd4dcedd5ca7653ce672d4ae77a5aa28f3995517 100644 (file)
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -1,21 +1,19 @@
 Summary:       ConsoleKit for PolicyKit
 Summary(pl.UTF-8):     ConsoleKit dla PolicyKit
 Name:          ConsoleKit
-Version:       0.4.1
-Release:       4
+Version:       0.4.5
+Release:       3
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
-# Source0-md5: 48eda4483cc97841d5f88e8e003eb6d7
-Patch0:                %{name}-reorder-initialization.patch
+# Source0-md5: f2657f93761206922d558471a936fbc3
 URL:           http://www.freedesktop.org/wiki/Software/ConsoleKit
-BuildRequires: dbus-glib-devel >= 0.30
+BuildRequires: dbus-glib-devel >= 0.82
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.8.0
+BuildRequires: glib2-devel >= 1:2.14.0
 # for <sys/inotify.h>
 BuildRequires: glibc-devel >= 6:2.4
-BuildRequires: libtool >= 1.4
 BuildRequires: pam-devel >= 0.80
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.92
@@ -26,11 +24,11 @@ BuildRequires:      zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-dirs = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      dbus-glib >= 0.30
+Requires:      dbus-glib >= 0.82
 Requires:      filesystem >= 3.0-25
-Requires:      glib2 >= 1:2.8.0
+Requires:      glib2 >= 1:2.14.0
 Requires:      rc-scripts
-Requires:      xorg-lib-libX11 >= 1.0.0
+Suggests:      udev-acl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -95,12 +93,26 @@ 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.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
+       --disable-silent-rules \
        --enable-docbook-docs \
        --enable-pam-module \
        --enable-static \
@@ -111,11 +123,16 @@ Statyczna biblioteka ConsoleKit.
 
 %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
@@ -139,8 +156,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
@@ -148,7 +163,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*
 
@@ -181,3 +199,8 @@ 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