Update to 0.2.2

Remove upstreamed patches
This commit is contained in:
Marek Kasik 2012-03-22 10:50:38 +01:00
parent e0f0a8745c
commit 80dca2ba13
5 changed files with 8 additions and 34 deletions

1
.gitignore vendored
View File

@ -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.2.tar.bz2
/cups-pk-helper-0.1.3.tar.bz2 /cups-pk-helper-0.1.3.tar.bz2
/cups-pk-helper-0.2.1.tar.bz2 /cups-pk-helper-0.2.1.tar.bz2
/cups-pk-helper-0.2.2.tar.bz2

View File

@ -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)

View File

@ -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);

View File

@ -1,6 +1,6 @@
Name: cups-pk-helper Name: cups-pk-helper
Version: 0.2.1 Version: 0.2.2
Release: 3%{?dist} Release: 1%{?dist}
Summary: A helper that makes system-config-printer use PolicyKit Summary: A helper that makes system-config-printer use PolicyKit
Group: System Environment/Base 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 Source0: http://cgit.freedesktop.org/cups-pk-helper/snapshot/cups-pk-helper-%{version}.tar.bz2
Patch0: polkit_result.patch Patch0: polkit_result.patch
Patch1: cups-pk-helper-requesting-user-name.patch
Patch2: cups-pk-helper-configure.patch
BuildRequires: libtool >= 1.4.3 BuildRequires: libtool >= 1.4.3
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
@ -40,8 +38,6 @@ interfaces available under control of PolicyKit.
%setup -q %setup -q
%patch0 -p1 -b .polkit-result %patch0 -p1 -b .polkit-result
%patch1 -p1 -b .requesting-user-name
%patch2 -p1 -b .configure
%build %build
@ -69,6 +65,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

View File

@ -1 +1 @@
c9858f7d722ff4c29e0201cb464cde91 cups-pk-helper-0.2.1.tar.bz2 848ed420884b7c528eb697047fa1ca52 cups-pk-helper-0.2.2.tar.bz2