X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ConsoleKit.spec;h=c0ac0a0d8191194345f89977453e16f406e2ee97;hb=ca955849659084e12f5665b8749cef5e1cb7f39d;hp=fb32668e01f78066e70815ae48308cb6db320c99;hpb=713c701ac48584295de127f29c8f68ec9b299b7f;p=packages%2FConsoleKit.git diff --git a/ConsoleKit.spec b/ConsoleKit.spec index fb32668..c0ac0a0 100644 --- a/ConsoleKit.spec +++ b/ConsoleKit.spec @@ -1,35 +1,34 @@ -# TODO: -# - generally check all Summary: ConsoleKit for PolicyKit Summary(pl.UTF-8): ConsoleKit dla PolicyKit Name: ConsoleKit -Version: 0.2.1 -Release: 1 -License: GPL v2 +Version: 0.4.5 +Release: 3 +License: GPL v2+ Group: Libraries -Source0: http://people.freedesktop.org/~mccann/dist/%{name}-%{version}.tar.gz -# Source0-md5: 8bf5e83931a8a3c2abcd541781e1554c -Source1: %{name}.init -Patch0: %{name}-SIGINT.patch -URL: http://gitweb.freedesktop.org/?p=ConsoleKit.git -BuildRequires: PolicyKit-devel -BuildRequires: autoconf >= 2.54 -BuildRequires: automake >= 1:1.7 -BuildRequires: dbus-glib-devel >= 0.30 -BuildRequires: glib2-devel >= 1:2.8.0 -BuildRequires: gtk+2-devel >= 2:2.8.0 -BuildRequires: gtk-doc >= 1.3 -BuildRequires: libtool >= 1.4 +Source0: http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2 +# Source0-md5: f2657f93761206922d558471a936fbc3 +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 +# for +BuildRequires: glibc-devel >= 6:2.4 BuildRequires: pam-devel >= 0.80 BuildRequires: pkgconfig +BuildRequires: polkit-devel >= 0.92 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}-dirs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -Requires: PolicyKit -Requires: dbus-glib >= 0.30 -Requires: glib2 >= 1:2.8.0 -Requires: rc-scripts +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 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -54,6 +53,19 @@ ConsoleKit library. %description libs -l pl.UTF-8 Biblioteka ConsoleKit. +%package dirs +Summary: ConsoleKit directories +Summary(pl.UTF-8): Katalogi ConsoleKit +License: AFL v2.1 or GPL v2 +Group: Libraries +Conflicts: ConsoleKit < 0.4.1-2 + +%description dirs +ConsoleKit directories. + +%description dirs -l pl.UTF-8 +Katalogi ConsoleKit. + %package devel Summary: Header files for ConsoleKit Summary(pl.UTF-8): Pliki nagłówkowe ConsoleKit @@ -81,45 +93,54 @@ 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 -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} %configure \ - --enable-pam-module \ + --disable-silent-rules \ --enable-docbook-docs \ + --enable-pam-module \ --enable-static \ - --with-pam-module-dir=/%{_lib}/security -%{__make} + --with-pam-module-dir=/%{_lib}/security \ + --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid + +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ConsoleKit +# 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 -f $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la} +%{__rm} $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 @@ -127,18 +148,44 @@ fi %files %defattr(644,root,root,755) %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) %{_prefix}/lib/ConsoleKit/scripts/* %attr(755,root,root) /%{_lib}/security/pam_ck_connector.so -%{_sysconfdir}/dbus-1/system.d/ConsoleKit.conf -%attr(754,root,root) /etc/rc.d/init.d/* -%{_mandir}/man8/pam_ck_connector* +%{_datadir}/polkit-1/actions/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 +/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* %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 dirs +%defattr(644,root,root,755) +%dir %{_sysconfdir}/ConsoleKit +%dir %{_sysconfdir}/ConsoleKit/run-session.d +%dir %{_sysconfdir}/ConsoleKit/run-seat.d +%dir %{_sysconfdir}/ConsoleKit/seats.d +%dir %{_prefix}/lib/ConsoleKit/run-session.d +%dir %{_prefix}/lib/ConsoleKit/run-seat.d +%dir %{_prefix}/lib/ConsoleKit/scripts +%dir %{_localstatedir}/run/ConsoleKit +%dir %{_localstatedir}/log/ConsoleKit %files devel %defattr(644,root,root,755) @@ -152,3 +199,8 @@ fi %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