From 6b4cb6d29ff2c024bf42e2f37de295b3c3db349d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 10 Mar 2011 19:43:44 -0500
Subject: [PATCH] 0.1.1

---
 .gitignore          |  1 +
 cups-pk-helper.spec | 44 +++++++++++---------------------------------
 sources             |  2 +-
 3 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index d25bba3..5327132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cups-pk-helper-0.0.4.tar.bz2
+/cups-pk-helper-0.1.1.tar.bz2
diff --git a/cups-pk-helper.spec b/cups-pk-helper.spec
index 34b372a..4727745 100644
--- a/cups-pk-helper.spec
+++ b/cups-pk-helper.spec
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
-Version:        0.0.4
-Release:        14%{?dist}
+Version:        0.1.1
+Release:        1%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -8,19 +8,6 @@ License:        GPLv2+
 URL:            http://www.vuntz.net/download/cups-pk-helper/
 Source0:        http://www.vuntz.net/download/cups-pk-helper/cups-pk-helper-%{version}.tar.bz2
 
-Patch0:         polkit-1.patch
-Patch1:         get_devices.patch
-Patch2:         polkit_result.patch
-Patch3:         edit_job.patch
-Patch4:         cups-pk-helper-ppd-name.patch
-Patch5:         allow_authentication.patch
-Patch6:         cups-pk-helper-add-printer-ppd-optional.patch
-Patch7:         cups-pk-helper-job-status.patch
-Patch8:         cups-pk-helper-invalid-job.patch
-Patch9:         cups-pk-helper-jobcancelpurge.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  libtool >= 1.4.3
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  python-devel >= 2.4
@@ -32,6 +19,7 @@ BuildRequires:  polkit-gnome >= 0.92
 BuildRequires:  intltool >= 0.40.0
 BuildRequires:  gettext-devel >= 0.17
 BuildRequires:  gnome-common >= 2.26
+BuildRequires:  autoconf automake libtool
 
 Requires:       python >= 2.4
 Requires:       cups-libs >= 1.2
@@ -47,35 +35,21 @@ interfaces available under control of PolicyKit.
 %prep
 %setup -q
 
-%patch0 -p1 -b .polkit-1
-%patch1 -p1 -b .get-devices
-%patch2 -p1 -b .polkit-result
-%patch3 -p1 -b .edit-job
-%patch4 -p1 -b .ppd-name
-%patch5 -p1 -b .allow_auth
-%patch6 -p1 -b .ppd
-%patch7 -p1 -b .job-status
-%patch8 -p1 -b .invalid-job
-%patch9 -p1 -b .jobcancelpurge
-
 %build
-# Patch0 modifies configure.ac
-gnome-autogen.sh
+# grr, tarball without configure
+./autogen.sh
 
 %configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %{name}
 
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_libexecdir}/cups-pk-helper-mechanism
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf
@@ -86,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 10 2011 Matthias Clasen <mclasen@redhat.com> - 0.1.1-1
+- Update to 0.1.1
+- Drop accumulated upstreamed patches
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 52da669..79c8c34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f01b83bbe35641b330efcff95bbaee7b  cups-pk-helper-0.0.4.tar.bz2
+830f711bbf85ae85a7dbfa9cb31dc72f  cups-pk-helper-0.1.1.tar.bz2