[cups-pk-helper/f16] Update to 0.1.3 Fix #724959

mkasik mkasik at fedoraproject.org
Fri Aug 5 14:29:29 UTC 2011


commit 85c258d982ed63faedf8a5299678f199d5bf453b
Author: Marek Kasik <mkasik at redhat.com>
Date:   Fri Aug 5 16:28:48 2011 +0200

    Update to 0.1.3
    Fix #724959

 .gitignore                           |    1 +
 cups-pk-helper-check-mechanism.patch |   23 +++++++++++++++++++++++
 cups-pk-helper.spec                  |   10 +++++++++-
 sources                              |    2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ec350b..092c705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cups-pk-helper-0.0.4.tar.bz2
 /cups-pk-helper-0.1.1.tar.bz2
 /cups-pk-helper-0.1.2.tar.bz2
+/cups-pk-helper-0.1.3.tar.bz2
diff --git a/cups-pk-helper-check-mechanism.patch b/cups-pk-helper-check-mechanism.patch
new file mode 100644
index 0000000..9851de3
--- /dev/null
+++ b/cups-pk-helper-check-mechanism.patch
@@ -0,0 +1,23 @@
+diff --git a/src/cups-pk-helper-mechanism.c b/src/cups-pk-helper-mechanism.c
+index 273c262..8b3d781 100644
+--- a/src/cups-pk-helper-mechanism.c
++++ b/src/cups-pk-helper-mechanism.c
+@@ -205,6 +205,8 @@ register_mechanism (CphMechanism *mechanism)
+ {
+         GError *error;
+ 
++        g_return_val_if_fail (CPH_IS_MECHANISM (mechanism), FALSE);
++
+         mechanism->priv->pol_auth = polkit_authority_get ();
+ 
+         error = NULL;
+@@ -238,7 +240,8 @@ cph_mechanism_new (void)
+         object = g_object_new (CPH_TYPE_MECHANISM, NULL);
+ 
+         if (!register_mechanism (CPH_MECHANISM (object))) {
+-                g_object_unref (object);
++                if (object)
++                        g_object_unref (object);
+                 return NULL;
+         }
+ 
diff --git a/cups-pk-helper.spec b/cups-pk-helper.spec
index df58113..6e44ede 100644
--- a/cups-pk-helper.spec
+++ b/cups-pk-helper.spec
@@ -1,5 +1,5 @@
 Name:           cups-pk-helper
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://www.vuntz.net/download/cups-pk-helper/
 Source0:        http://cgit.freedesktop.org/cups-pk-helper/snapshot/cups-pk-helper-%{version}.tar.bz2
 
+Patch0:         cups-pk-helper-check-mechanism.patch
+
 BuildRequires:  libtool >= 1.4.3
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  python-devel >= 2.4
@@ -35,6 +37,8 @@ interfaces available under control of PolicyKit.
 %prep
 %setup -q
 
+%patch0 -p1 -b .check-mechanism
+
 %build
 # grr, tarball without configure
 ./autogen.sh
@@ -60,6 +64,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  5 2011 Marek Kasik <mkasik at redhat.com> - 0.1.3-1
+- Update to 0.1.3
+- Fix #724959
+
 * Wed Mar 23 2011 Marek Kasik <mkasik at redhat.com> - 0.1.2-1
 - Update to 0.1.2
 
diff --git a/sources b/sources
index 9e80188..341b7f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c02eb07c7423fde1db943b83748f774  cups-pk-helper-0.1.2.tar.bz2
+885eabdf404cc80797478cc52414b21b  cups-pk-helper-0.1.3.tar.bz2


More information about the scm-commits mailing list