- 0.3.1

Changed files:
    ConsoleKit-fixes.patch -> 1.1
    ConsoleKit.spec -> 1.27

diff --git a/ConsoleKit-fixes.patch b/ConsoleKit-fixes.patch
new file mode 100644 (file)
index 0000000..2586ec9
--- /dev/null
+++ b/ConsoleKit-fixes.patch
@@ -0,0 +1,47 @@
+diff -up ConsoleKit-0.3.1/src/ck-manager.c.small-fixes ConsoleKit-0.3.1/src/ck-manager.c
+--- ConsoleKit-0.3.1/src/ck-manager.c.small-fixes      2009-07-31 22:32:32.382848777 -0400
++++ ConsoleKit-0.3.1/src/ck-manager.c  2009-07-31 22:34:55.159597733 -0400
+@@ -810,12 +810,9 @@ check_polkit_permissions (CkManager     
+                           AuthorizedCallback     callback)
+ {
+         const char    *sender;
+-        GError        *error;
+         PolkitSubject *subject;
+         AuthorizedCallbackData *data;
+ 
+-        error = NULL;
+-
+         g_debug ("constructing polkit data");
+ 
+         /* Check that caller is privileged */
+@@ -837,6 +834,7 @@ check_polkit_permissions (CkManager     
+                                               NULL,
+                                               (GAsyncReadyCallback)auth_ready_callback,
+                                               data);
++        g_object_unref (subject);
+ }
+ 
+ static void
+@@ -873,14 +871,12 @@ get_polkit_permissions (CkManager   *man
+ {
+         const char    *sender;
+         PolkitSubject *subject;
+-        GError *error;
+ 
+         g_debug ("get permissions for action %s", action);
+ 
+         sender = dbus_g_method_get_sender (context);
+         subject = polkit_system_bus_name_new (sender);
+ 
+-        error = NULL;
+         polkit_authority_check_authorization (manager->priv->pol_ctx,
+                                               subject,
+                                               action,
+@@ -890,7 +886,6 @@ get_polkit_permissions (CkManager   *man
+                                               (GAsyncReadyCallback) ready_cb,
+                                               context);
+         g_object_unref (subject);
+-
+ }
+ #endif
+ 

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index ce6706db683368b3d1250b43e8d69ef42e39da75..7349a0e00ee485c76e58984f386e19a51acce565 100644 (file)
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -1,16 +1,14 @@
 Summary:       ConsoleKit for PolicyKit
 Summary(pl.UTF-8):     ConsoleKit dla PolicyKit
 Name:          ConsoleKit
-Version:       0.3.0
-Release:       6
+Version:       0.3.1
+Release:       1
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://people.freedesktop.org/~mccann/dist/%{name}-%{version}.tar.bz2
-# Source0-md5: 43b02a52212330b54cfb34c4044d9ce0
-Patch0:                %{name}-dbus.patch
-Patch1:                %{name}-skip_xmlto_validation.patch
+Source0:       http://www.freedesktop.org/software/ConsoleKit/dist/%{name}-%{version}.tar.bz2
+# Source0-md5: 3ee89345f610c462806aaaae9a997683
+Patch0:                %{name}-fixes.patch
 URL:           http://www.freedesktop.org/wiki/Software/ConsoleKit
-BuildRequires: PolicyKit-devel >= 0.7
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
 BuildRequires: dbus-glib-devel >= 0.30
@@ -21,6 +19,7 @@ BuildRequires:        glibc-devel >= 6:2.4
 BuildRequires: libtool >= 1.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
@@ -86,7 +85,6 @@ Statyczna biblioteka ConsoleKit.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -137,7 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/lib/ConsoleKit/scripts
 %attr(755,root,root) %{_prefix}/lib/ConsoleKit/scripts/*
 %attr(755,root,root) /%{_lib}/security/pam_ck_connector.so
-%{_datadir}/PolicyKit/policy/org.freedesktop.consolekit.policy
+%{_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