From 80dca2ba139aeeafbdcba13235314f2298ce14aa Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Thu, 22 Mar 2012 10:50:38 +0100
Subject: [PATCH] Update to 0.2.2

Remove upstreamed patches
---
 .gitignore                                |  1 +
 cups-pk-helper-configure.patch            | 16 ----------------
 cups-pk-helper-requesting-user-name.patch | 11 -----------
 cups-pk-helper.spec                       | 12 ++++++------
 sources                                   |  2 +-
 5 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 cups-pk-helper-configure.patch
 delete mode 100644 cups-pk-helper-requesting-user-name.patch

diff --git a/.gitignore b/.gitignore
index c7f9338..50f717a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ cups-pk-helper-0.0.4.tar.bz2
 /cups-pk-helper-0.1.2.tar.bz2
 /cups-pk-helper-0.1.3.tar.bz2
 /cups-pk-helper-0.2.1.tar.bz2
+/cups-pk-helper-0.2.2.tar.bz2
diff --git a/cups-pk-helper-configure.patch b/cups-pk-helper-configure.patch
deleted file mode 100644
index 84995e6..0000000
--- a/cups-pk-helper-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,11 +37,11 @@ GIO_REQUIRED=2.29.8
- POLKIT_REQUIRED=0.97
- 
- # pkg-config dependency checks
--PKG_CHECK_MODULES(CUPS_PK, gio-2.0 >= $GIO_REQUIRED polkit-gobject-1 >= $POLKIT_REQUIRED)
-+PKG_CHECK_MODULES(CUPS_PK, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0 >= $GIO_REQUIRED polkit-gobject-1 >= $POLKIT_REQUIRED)
- AC_SUBST(CUPS_PK_CFLAGS)
- AC_SUBST(CUPS_PK_LIBS)
- 
--PKG_CHECK_MODULES(TEST, gio-2.0 >= $GIO_REQUIRED)
-+PKG_CHECK_MODULES(TEST, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0 >= $GIO_REQUIRED)
- AC_SUBST(TEST_CFLAGS)
- AC_SUBST(TEST_LIBS)
- 
diff --git a/cups-pk-helper-requesting-user-name.patch b/cups-pk-helper-requesting-user-name.patch
deleted file mode 100644
index 64f41b4..0000000
--- a/cups-pk-helper-requesting-user-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cups-pk-helper-0.1.3/src/cups.c	2011-10-27 14:02:04.000000000 +0200
-+++ cups-pk-helper-0.1.3/src/cups.c	2011-10-27 14:39:06.000000000 +0200
-@@ -2209,6 +2209,8 @@ cph_cups_job_get_status (CphCups    *cup
-                        "requested-attributes", 1, NULL, attrs);
- 
-         resource_char = _cph_cups_get_resource (CPH_RESOURCE_ROOT);
-+        ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-+                      "requesting-user-name", NULL, cupsUser ());
-         reply = cupsDoRequest (cups->priv->connection,
-                                request, resource_char);
- 
diff --git a/cups-pk-helper.spec b/cups-pk-helper.spec
index 41a4e7c..9062a0f 100644
--- a/cups-pk-helper.spec
+++ b/cups-pk-helper.spec
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
-Version:        0.2.1
-Release:        3%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -9,8 +9,6 @@ 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:         polkit_result.patch
-Patch1:         cups-pk-helper-requesting-user-name.patch
-Patch2:         cups-pk-helper-configure.patch
 
 BuildRequires:  libtool >= 1.4.3
 BuildRequires:  cups-devel >= 1.2
@@ -40,8 +38,6 @@ interfaces available under control of PolicyKit.
 %setup -q
 
 %patch0 -p1 -b .polkit-result
-%patch1 -p1 -b .requesting-user-name
-%patch2 -p1 -b .configure
 
 
 %build
@@ -69,6 +65,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 22 2012 Marek Kasik <mkasik@redhat.com> - 0.2.2-1
+- Update to 0.2.2
+- Remove upstreamed patches
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 2d17a35..9c6379a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9858f7d722ff4c29e0201cb464cde91  cups-pk-helper-0.2.1.tar.bz2
+848ed420884b7c528eb697047fa1ca52  cups-pk-helper-0.2.2.tar.bz2