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
%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 \
--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
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
%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
%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.*.*.*
%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
%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