rpms/system-config-printer/F-12 pycups-1.9.50.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.214, 1.215 sources, 1.220, 1.221 system-config-printer-no-epydoc.patch, 1.5, 1.6 system-config-printer.spec, 1.369, 1.370 pycups-1.9.49.tar.bz2.sig, 1.1, NONE pycups-add-getJobs-requested-attrs.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5650

Modified Files:
	.cvsignore sources system-config-printer-no-epydoc.patch 
	system-config-printer.spec 
Added Files:
	pycups-1.9.50.tar.bz2.sig 
Removed Files:
	pycups-1.9.49.tar.bz2.sig 
	pycups-add-getJobs-requested-attrs.patch 
Log Message:
* Tue May 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-8
- Updated pycups to 1.9.50.



--- NEW FILE pycups-1.9.50.tar.bz2.sig ---
ˆ? Kò†•´}šJÚ×/÷ ž-,6‘
@ÜQmÆjè|Eµ¨ ŸMóo{H³Õ{¤Ê€çf6µžÃ0p

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/.cvsignore,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- .cvsignore	18 May 2010 12:15:25 -0000	1.214
+++ .cvsignore	18 May 2010 13:53:13 -0000	1.215
@@ -214,3 +214,4 @@ system-config-printer-1.1.17.tar.xz
 pycups-1.9.49.tar.bz2
 system-config-printer-1.1.18.tar.xz
 pysmbc-1.0.7.tar.bz2
+pycups-1.9.50.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/sources,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- sources	18 May 2010 12:15:25 -0000	1.220
+++ sources	18 May 2010 13:53:14 -0000	1.221
@@ -1,4 +1,3 @@
-ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-6db9d8bc7f40315bc0b93f210737cc82  pycups-1.9.49.tar.bz2
 be1b9253fa8ababebc9b2ab62c2e9591  system-config-printer-1.1.18.tar.xz
 89e6fd9129f1700eec16156bdbf60dda  pysmbc-1.0.7.tar.bz2
+cae67ab1207f5ffa93edc9b5867738bb  pycups-1.9.50.tar.bz2

system-config-printer-no-epydoc.patch:
 Makefile.am            |    4 +++-
 Makefile.in            |    4 +++-
 pycups-1.9.50/Makefile |    4 +++-
 pysmbc-1.0.7/Makefile  |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

Index: system-config-printer-no-epydoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer-no-epydoc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- system-config-printer-no-epydoc.patch	18 May 2010 12:15:25 -0000	1.5
+++ system-config-printer-no-epydoc.patch	18 May 2010 13:53:14 -0000	1.6
@@ -26,9 +26,9 @@ diff -up system-config-printer-1.1.18/Ma
  
  distcheck-hook: update-po
  
-diff -up system-config-printer-1.1.18/pycups-1.9.49/Makefile.no-epydoc system-config-printer-1.1.18/pycups-1.9.49/Makefile
---- system-config-printer-1.1.18/pycups-1.9.49/Makefile.no-epydoc	2010-03-10 09:45:10.000000000 +0000
-+++ system-config-printer-1.1.18/pycups-1.9.49/Makefile	2010-05-18 12:59:19.919941034 +0100
+diff -up system-config-printer-1.1.18/pycups-1.9.50/Makefile.no-epydoc system-config-printer-1.1.18/pycups-1.9.50/Makefile
+--- system-config-printer-1.1.18/pycups-1.9.50/Makefile.no-epydoc	2010-03-10 09:45:10.000000000 +0000
++++ system-config-printer-1.1.18/pycups-1.9.50/Makefile	2010-05-18 12:59:19.919941034 +0100
 @@ -14,7 +14,9 @@ cups.so: $(SOURCES)
  
  doc:	cups.so


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- system-config-printer.spec	18 May 2010 12:15:25 -0000	1.369
+++ system-config-printer.spec	18 May 2010 13:53:14 -0000	1.370
@@ -1,4 +1,4 @@
-%global pycups_version 1.9.49
+%global pycups_version 1.9.50
 %global pysmbc_version 1.0.7
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -23,8 +23,6 @@ Patch5: system-config-printer-JobCancel.
 Patch6: system-config-printer-asyncipp-traceback.patch
 Patch7: system-config-printer-use-getJobs-requested-attrs.patch
 
-Patch100: pycups-add-getJobs-requested-attrs.patch
-
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -104,14 +102,6 @@ printers.
 # Specify requested attributes in getJobs if possible (bug #584806).
 %patch7 -p1 -b .use-getJobs-requested-attrs
 
-pushd pycups-%{pycups_version}
-
-# Added optional requested_attributes argument to Connection.getJobs
-# (bug #584806).
-%patch100 -p1 -b .add-getJobs-requested-attrs
-
-popd
-
 %build
 %configure --with-udev-rules --with-polkit-1
 
@@ -151,7 +141,7 @@ rm -rf %buildroot
 %doc --parents pysmbc-%{pysmbc_version}/{README,NEWS,TODO,html}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf
 %{python_sitearch}/cups.so
-%{python_sitearch}/cups-1.0-py%{pyver}.egg-info
+%{python_sitearch}/pycups-%{pycups_version}-py%{pyver}.egg-info
 %{python_sitearch}/smbc.so
 %{python_sitearch}/pysmbc-%{pysmbc_version}-py%{pyver}.egg-info
 %dir %{python_sitelib}/cupshelpers
@@ -229,6 +219,7 @@ exit 0
 
 %changelog
 * Tue May 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-8
+- Updated pycups to 1.9.50.
 - Updated pysmbc to 1.0.7.
 
 * Thu Apr 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-7


--- pycups-1.9.49.tar.bz2.sig DELETED ---


--- pycups-add-getJobs-requested-attrs.patch DELETED ---