rpms/ConsoleKit/devel ConsoleKit-skipvalidation.patch, 1.1, 1.2 ConsoleKit.spec, 1.41, 1.42

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	ConsoleKit-skipvalidation.patch ConsoleKit.spec 
Log Message:
Port to PolicyKit 1


ConsoleKit-skipvalidation.patch:

Index: ConsoleKit-skipvalidation.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit-skipvalidation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ConsoleKit-skipvalidation.patch	28 Feb 2009 01:26:32 -0000	1.1
+++ ConsoleKit-skipvalidation.patch	9 Jun 2009 15:19:07 -0000	1.2
@@ -1,6 +1,18 @@
+diff -up ConsoleKit-0.3.0/doc/dbus/Makefile.am.skipvalidation ConsoleKit-0.3.0/doc/dbus/Makefile.am
+--- ConsoleKit-0.3.0/doc/dbus/Makefile.am.skipvalidation	2009-05-12 18:19:48.076290613 -0400
++++ ConsoleKit-0.3.0/doc/dbus/Makefile.am	2009-05-12 18:20:39.310290934 -0400
+@@ -16,7 +16,7 @@ htmldocdir = $(docdir)/spec
+ htmldoc_DATA = ConsoleKit.html
+ 
+ ConsoleKit.html : $(SPEC_XML_FILES)
+-	$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
++	$(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
+ 
+ endif # DOCBOOK_DOCS_ENABLED
+ 
 diff -up ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation ConsoleKit-0.3.0/doc/dbus/Makefile.in
---- ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation	2009-02-27 20:17:36.784329106 -0500
-+++ ConsoleKit-0.3.0/doc/dbus/Makefile.in	2009-02-27 20:18:15.701316733 -0500
+--- ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation	2008-07-30 20:41:09.000000000 -0400
++++ ConsoleKit-0.3.0/doc/dbus/Makefile.in	2009-05-12 18:19:14.803321606 -0400
 @@ -427,7 +427,7 @@ uninstall-am: uninstall-htmldocDATA
  
  


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ConsoleKit.spec	21 Apr 2009 04:56:15 -0000	1.41
+++ ConsoleKit.spec	9 Jun 2009 15:19:07 -0000	1.42
@@ -1,12 +1,12 @@
 %define glib2_version           2.6.0
 %define dbus_version            0.90
 %define dbus_glib_version       0.70
-%define polkit_version          0.7
+%define polkit_version          0.92
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -18,11 +18,12 @@ Requires: dbus-glib >= %{dbus_glib_versi
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: PolicyKit-devel >= %{polkit_version}
+BuildRequires: polkit-devel >= %{polkit_version}
 BuildRequires: pam-devel
 BuildRequires: libX11-devel
 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
@@ -34,6 +35,9 @@ 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.
@@ -81,7 +85,7 @@ developing software that is interacting 
 Summary: Developer documentation for ConsoleKit
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
-BuildArch: noarch
+#BuildArch: noarch
 
 %description docs
 This package contains developer documentation for ConsoleKit.
@@ -92,6 +96,9 @@ This package contains developer document
 %patch1 -p1 -b .consolekit
 %patch2 -p1 -b .skipvalidation
 %patch3 -p1 -b .null-warning
+%patch4 -p1 -b .polkit1
+
+autoreconf -f -i
 
 %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}
@@ -129,7 +136,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
 %{_datadir}/dbus-1/system-services/*.service
-%{_datadir}/PolicyKit/policy/*.policy
+%{_datadir}/polkit-1/actions/*.policy
 %dir %{_sysconfdir}/ConsoleKit
 %dir %{_sysconfdir}/ConsoleKit/seats.d
 %dir %{_sysconfdir}/ConsoleKit/run-session.d
@@ -172,6 +179,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon May 11 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-9
+- Port to PolicyKit 1
+
 * Tue Apr 21 2009 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-8
 - Fix a warning on login (#496636)