rpms/ConsoleKit/devel .cvsignore, 1.8, 1.9 ConsoleKit.spec, 1.17, 1.18 sources, 1.8, 1.9

[William Jon McCann (mccann)]

Author: mccann

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23023

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
- Update to 0.2.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Sep 2007 15:34:15 -0000	1.8
+++ .cvsignore	23 Jan 2008 21:38:20 -0000	1.9
@@ -1 +1 @@
-ConsoleKit-0.2.3.tar.gz
+ConsoleKit-0.2.5.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ConsoleKit.spec	11 Nov 2007 19:50:36 -0000	1.17
+++ ConsoleKit.spec	23 Jan 2008 21:38:20 -0000	1.18
@@ -4,13 +4,12 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.2.3
-Release: 3%{?dist}
+Version: 0.2.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit 
 Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.gz
-Patch0: ConsoleKit-0.2.1-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 
@@ -20,6 +19,7 @@
 BuildRequires: pam-devel
 BuildRequires: libX11-devel
 BuildRequires: xmlto
+BuildRequires: PolicyKit-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -75,7 +75,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .lsb
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -91,19 +90,17 @@
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.a
 rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.la
 
+mkdir -p $RPM_BUILD_ROOT/%{_var}/log/ConsoleKit
+
 cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add ConsoleKit
-/sbin/chkconfig ConsoleKit resetpriorities
-
-%preun
-if [ $1 = 0 ]; then
-    /sbin/service ConsoleKit stop > /dev/null 2>&1
-    /sbin/chkconfig --del ConsoleKit
+if [ ! -f /var/log/ConsoleKit/history ]; then
+   umask 022
+   touch /var/log/ConsoleKit/history
 fi
 
 %files
@@ -114,12 +111,16 @@
 %doc %{_datadir}/doc/%{name}-%{version}/NEWS
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
-%{_sysconfdir}/rc.d/init.d/ConsoleKit
+%{_datadir}/dbus-1/system-services/*.service
+%{_datadir}/PolicyKit/policy/*.policy
 %dir %{_sysconfdir}/ConsoleKit
 %dir %{_sysconfdir}/ConsoleKit/seats.d
+%attr(755,root,root) %{_var}/log/ConsoleKit
 %config %{_sysconfdir}/ConsoleKit/seats.d/00-primary.seat
 %{_sbindir}/console-kit-daemon
 %{_bindir}/ck-list-sessions
+%{_bindir}/ck-history
+%{_libdir}/ConsoleKit/scripts/*
 
 %files x11
 %defattr(-,root,root,-)
@@ -144,6 +145,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Wed Jan 23 2008 Jon McCann  <jmccann at redhat.com> - 0.2.5-1
+- Update to 0.2.5
+
 * Sun Nov 11 2007 Matthias Clasen  <mclasen at redhat.com> - 0.2.3-3
 - Correct the URL (#375571)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Sep 2007 15:34:15 -0000	1.8
+++ sources	23 Jan 2008 21:38:20 -0000	1.9
@@ -1 +1 @@
-dc4b3194ec583b03747ffc909a5571da  ConsoleKit-0.2.3.tar.gz
+5b1200a5aec1f28485b57618484d4060  ConsoleKit-0.2.5.tar.gz