packages: ConsoleKit/ConsoleKit.spec - rel.3 - move directories to dirs sub...

blues blues at pld-linux.org
Sun Nov 29 23:36:17 CET 2009


Author: blues                        Date: Sun Nov 29 22:36:17 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.3 - move directories to dirs subpackage. udev-core requires
  /usr/lib/ConsoleKit/run-seat.d, don't follow that.

---- Files affected:
packages/ConsoleKit:
   ConsoleKit.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/ConsoleKit/ConsoleKit.spec
diff -u packages/ConsoleKit/ConsoleKit.spec:1.30 packages/ConsoleKit/ConsoleKit.spec:1.31
--- packages/ConsoleKit/ConsoleKit.spec:1.30	Fri Nov 27 02:20:30 2009
+++ packages/ConsoleKit/ConsoleKit.spec	Sun Nov 29 23:36:12 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	ConsoleKit dla PolicyKit
 Name:		ConsoleKit
 Version:	0.4.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
@@ -24,6 +24,7 @@
 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:	dbus-glib >= 0.30
 Requires:	filesystem >= 3.0-25
@@ -54,6 +55,19 @@
 %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
@@ -126,9 +140,6 @@
 %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
-%dir %{_prefix}/lib/ConsoleKit/run-session.d
-%dir %{_prefix}/lib/ConsoleKit/run-seat.d
-%dir %{_prefix}/lib/ConsoleKit/scripts
 %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
@@ -137,20 +148,26 @@
 %{_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
-%dir %{_sysconfdir}/ConsoleKit
-%dir %{_sysconfdir}/ConsoleKit/run-session.d
-%dir %{_sysconfdir}/ConsoleKit/run-seat.d
-%dir %{_sysconfdir}/ConsoleKit/seats.d
 %{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
 %{_mandir}/man8/pam_ck_connector.8*
-%dir %{_localstatedir}/run/ConsoleKit
-%dir %{_localstatedir}/log/ConsoleKit
 
 %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)
 %attr(755,root,root) %{_libdir}/libck-connector.so
@@ -170,6 +187,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/11/29 22:36:12  blues
+- rel.3 - move directories to dirs subpackage. udev-core requires
+  /usr/lib/ConsoleKit/run-seat.d, don't follow that.
+
 Revision 1.30  2009/11/27 01:20:30  sparky
 - BR: docbook-dtd412-xml
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ConsoleKit/ConsoleKit.spec?r1=1.30&r2=1.31&f=u



More information about the pld-cvs-commit mailing list