Summary: ConsoleKit for PolicyKit
Summary(pl.UTF-8): ConsoleKit dla PolicyKit
Name: ConsoleKit
-Version: 0.4.2
-Release: 1
+Version: 0.4.5
+Release: 10
License: GPL v2+
Group: Libraries
Source0: http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
-# Source0-md5: 285acb35bfcb2b8dc21c6071e6f6e116
+# Source0-md5: f2657f93761206922d558471a936fbc3
+Source1: %{name}.tmpfiles
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
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.626
BuildRequires: xmlto
BuildRequires: xorg-lib-libX11-devel >= 1.0.0
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.30
+Requires: dbus-glib >= 0.82
Requires: filesystem >= 3.0-25
-Requires: glib2 >= 1:2.8.0
-Requires: rc-scripts
-Requires: xorg-lib-libX11 >= 1.0.0
+Requires: glib2 >= 1:2.14.0
+Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 38
+Obsoletes: ConsoleKit-systemd
Suggests: udev-acl
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%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
--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
+install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
%{__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
+
+install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
%clean
rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post
+%systemd_post console-kit-daemon.service
+
+%preun
+%systemd_preun console-kit-daemon.service
+
+%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
%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
%{_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*
+%{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
%files libs
%defattr(644,root,root,755)
%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
%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