rpms/ConsoleKit/devel .cvsignore, 1.16, 1.17 ConsoleKit.spec, 1.46, 1.47 sources, 1.19, 1.20 ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch, 1.1, NONE ConsoleKit-skipvalidation.patch, 1.2, NONE consolekit-dbus-permissions.patch, 1.3, NONE null-warning.patch, 1.1, NONE polkit1.patch, 1.1, NONE

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5401

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Removed Files:
	ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch 
	ConsoleKit-skipvalidation.patch 
	consolekit-dbus-permissions.patch null-warning.patch 
	polkit1.patch 
Log Message:
- Update to 0.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	31 Jul 2008 01:13:18 -0000	1.16
+++ .cvsignore	31 Jul 2009 15:01:15 -0000	1.17
@@ -1 +1 @@
-ConsoleKit-0.3.0.tar.bz2
+ConsoleKit-0.3.1.tar.bz2


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ConsoleKit.spec	24 Jul 2009 15:05:28 -0000	1.46
+++ ConsoleKit.spec	31 Jul 2009 15:01:15 -0000	1.47
@@ -5,12 +5,12 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.3.0
-Release: 12%{?dist}
+Version: 0.3.1
+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.bz2
+Source0: http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -25,19 +25,6 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 BuildRequires: automake, autoconf, libtool
 
-Patch0: ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch
-# http://bugs.freedesktop.org/show_bug.cgi?id=19020
-# http://bugs.freedesktop.org/show_bug.cgi?id=20471
-Patch1: consolekit-dbus-permissions.patch
-
-Patch2: ConsoleKit-skipvalidation.patch
-
-# http://bugs.freedesktop.org/show_bug.cgi?id=21310
-Patch3: null-warning.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=495617
-Patch4: polkit1.patch
-
 %description
 ConsoleKit is a system daemon for tracking what users are logged
 into the system and how they interact with the computer (e.g.
@@ -92,11 +79,6 @@ This package contains developer document
 
 %prep
 %setup -q
-%patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
-%patch1 -p1 -b .consolekit
-%patch2 -p1 -b .skipvalidation
-%patch3 -p1 -b .null-warning
-%patch4 -p1 -b .polkit1
 
 autoreconf -f -i
 
@@ -117,6 +99,10 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/security/*
 # make sure we don't package a history log
 rm -f $RPM_BUILD_ROOT/%{_var}/log/ConsoleKit/history
 
+# The sample upstart files are good enough for us.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/event.d
+cp data/ck-log-system-{start,stop,restart} $RPM_BUILD_ROOT%{_sysconfdir}/event.d
+
 cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %clean
@@ -135,6 +121,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/NEWS
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
+%config(noreplace) %{_sysconfdir}/event.d/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_datadir}/polkit-1/actions/*.policy
 %dir %{_sysconfdir}/ConsoleKit
@@ -179,6 +166,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Fri Jul 31 2009 Ray Strode <rstrode at redhat.com> 0.3.1-1
+- Update to 0.3.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	31 Jul 2008 01:13:18 -0000	1.19
+++ sources	31 Jul 2009 15:01:16 -0000	1.20
@@ -1 +1 @@
-43b02a52212330b54cfb34c4044d9ce0  ConsoleKit-0.3.0.tar.bz2
+3ee89345f610c462806aaaae9a997683  ConsoleKit-0.3.1.tar.bz2


--- ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch DELETED ---


--- ConsoleKit-skipvalidation.patch DELETED ---


--- consolekit-dbus-permissions.patch DELETED ---


--- null-warning.patch DELETED ---


--- polkit1.patch DELETED ---