]> git.pld-linux.org Git - packages/ConsoleKit.git/blobdiff - ConsoleKit.spec
- drop upstart files
[packages/ConsoleKit.git] / ConsoleKit.spec
index 1f4a2c2e248434548455634a8387397cca5959eb..5255f3335678130df250795bd1b5bbd6ae0d7514 100644 (file)
@@ -1,36 +1,42 @@
 Summary:       ConsoleKit for PolicyKit
 Summary(pl.UTF-8):     ConsoleKit dla PolicyKit
 Name:          ConsoleKit
-Version:       0.4.2
-Release:       1
+Version:       0.4.6
+Release:       3
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
-# Source0-md5: 285acb35bfcb2b8dc21c6071e6f6e116
+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.30
+BuildRequires: dbus-glib-devel >= 0.82
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.8.0
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.22.0
 # for <sys/inotify.h>
 BuildRequires: glibc-devel >= 6:2.4
-BuildRequires: libtool >= 1.4
+BuildRequires: udev-devel
 BuildRequires: pam-devel >= 0.80
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.92
-BuildRequires: rpmbuild(macros) >= 1.268
+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.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
-Suggests:      udev-acl
+Requires:      glib2 >= 1:2.14.0
+Requires:      rc-scripts >= 0.4.3.0
+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
@@ -95,27 +101,50 @@ 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
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
        --disable-silent-rules \
        --enable-docbook-docs \
        --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} \
+       --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
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
+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
@@ -128,6 +157,18 @@ 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
@@ -139,8 +180,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,10 +187,23 @@ 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
 %{_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.*.*.*
@@ -159,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -181,3 +234,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
This page took 0.042955 seconds and 4 git commands to generate.