rpms/system-config-printer/devel pycups-1.9.48.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.210, 1.211 sources, 1.216, 1.217 system-config-printer-no-epydoc.patch, 1.2, 1.3 system-config-printer.spec, 1.346, 1.347 pycups-1.9.47.tar.bz2.sig, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1201

Modified Files:
	.cvsignore sources system-config-printer-no-epydoc.patch 
	system-config-printer.spec 
Added Files:
	pycups-1.9.48.tar.bz2.sig 
Removed Files:
	pycups-1.9.47.tar.bz2.sig 
Log Message:
* Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-10
- Update pycups to 1.9.48.



--- NEW FILE pycups-1.9.48.tar.bz2.sig ---
ˆ? KU§®´}šJÚ×2n Ÿ\¥I)¨eüû‹ã”ëh)¥qO ŸU9¢­$\BØQ/ó|~ÊM

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- .cvsignore	22 Dec 2009 16:15:03 -0000	1.210
+++ .cvsignore	19 Jan 2010 12:58:15 -0000	1.211
@@ -209,3 +209,4 @@ system-config-printer-1.1.14.tar.xz
 system-config-printer-1.1.15.tar.xz
 pycups-1.9.47.tar.bz2
 system-config-printer-1.1.16.tar.xz
+pycups-1.9.48.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- sources	22 Dec 2009 16:15:03 -0000	1.216
+++ sources	19 Jan 2010 12:58:15 -0000	1.217
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-b2c94db15c916e0776e320addb279ba8  pycups-1.9.47.tar.bz2
 8c2643d8a670eaadc3fa6890149b753b  system-config-printer-1.1.16.tar.xz
+2e9ed692c75328e7fb88f8c230f70990  pycups-1.9.48.tar.bz2

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

Index: system-config-printer-no-epydoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-no-epydoc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-printer-no-epydoc.patch	22 Dec 2009 14:33:05 -0000	1.2
+++ system-config-printer-no-epydoc.patch	19 Jan 2010 12:58:15 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up system-config-printer-1.1.13/Makefile.am.no-epydoc system-config-printer-1.1.13/Makefile.am
---- system-config-printer-1.1.13/Makefile.am.no-epydoc	2009-09-04 10:35:47.000000000 +0100
-+++ system-config-printer-1.1.13/Makefile.am	2009-10-30 11:32:02.265645319 +0000
-@@ -251,7 +251,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
+diff -up system-config-printer-1.1.16/Makefile.am.no-epydoc system-config-printer-1.1.16/Makefile.am
+--- system-config-printer-1.1.16/Makefile.am.no-epydoc	2009-12-22 14:44:19.000000000 +0000
++++ system-config-printer-1.1.16/Makefile.am	2010-01-19 12:50:09.018955351 +0000
+@@ -256,7 +256,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
  
  html:	$(EXPORT_MODULES)
  	rm -rf html
@@ -12,10 +12,10 @@ diff -up system-config-printer-1.1.13/Ma
  
  distcheck-hook: update-po
  
-diff -up system-config-printer-1.1.13/Makefile.in.no-epydoc system-config-printer-1.1.13/Makefile.in
---- system-config-printer-1.1.13/Makefile.in.no-epydoc	2009-09-14 15:14:03.000000000 +0100
-+++ system-config-printer-1.1.13/Makefile.in	2009-10-30 11:32:02.266644059 +0000
-@@ -1435,7 +1435,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
+diff -up system-config-printer-1.1.16/Makefile.in.no-epydoc system-config-printer-1.1.16/Makefile.in
+--- system-config-printer-1.1.16/Makefile.in.no-epydoc	2009-12-22 14:44:34.000000000 +0000
++++ system-config-printer-1.1.16/Makefile.in	2010-01-19 12:50:09.020955776 +0000
+@@ -1440,7 +1440,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
  
  html:	$(EXPORT_MODULES)
  	rm -rf html
@@ -26,9 +26,9 @@ diff -up system-config-printer-1.1.13/Ma
  
  distcheck-hook: update-po
  
-diff -up system-config-printer-1.1.13/pycups-1.9.47/Makefile.no-epydoc system-config-printer-1.1.13/pycups-1.9.47/Makefile
---- system-config-printer-1.1.13/pycups-1.9.47/Makefile.no-epydoc	2009-10-30 11:32:53.089519286 +0000
-+++ system-config-printer-1.1.13/pycups-1.9.47/Makefile	2009-10-30 11:33:07.606519162 +0000
+diff -up system-config-printer-1.1.16/pycups-1.9.48/Makefile.no-epydoc system-config-printer-1.1.16/pycups-1.9.48/Makefile
+--- system-config-printer-1.1.16/pycups-1.9.48/Makefile.no-epydoc	2010-01-19 12:34:47.000000000 +0000
++++ system-config-printer-1.1.16/pycups-1.9.48/Makefile	2010-01-19 12:50:30.098955294 +0000
 @@ -14,7 +14,9 @@ cups.so: $(SOURCES)
  
  doc:	cups.so
@@ -40,9 +40,9 @@ diff -up system-config-printer-1.1.13/py
  
  clean:
  	-rm -rf build cups.so *.pyc *~
-diff -up system-config-printer-1.1.13/pysmbc-1.0.6/Makefile.no-epydoc system-config-printer-1.1.13/pysmbc-1.0.6/Makefile
---- system-config-printer-1.1.13/pysmbc-1.0.6/Makefile.no-epydoc	2009-10-30 11:32:18.597519903 +0000
-+++ system-config-printer-1.1.13/pysmbc-1.0.6/Makefile	2009-10-30 11:32:43.671520242 +0000
+diff -up system-config-printer-1.1.16/pysmbc-1.0.6/Makefile.no-epydoc system-config-printer-1.1.16/pysmbc-1.0.6/Makefile
+--- system-config-printer-1.1.16/pysmbc-1.0.6/Makefile.no-epydoc	2008-10-20 15:51:14.000000000 +0100
++++ system-config-printer-1.1.16/pysmbc-1.0.6/Makefile	2010-01-19 12:50:30.100081172 +0000
 @@ -12,7 +12,9 @@ smbc.so: $(SOURCES)
  
  doc: smbc.so


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- system-config-printer.spec	18 Jan 2010 17:29:41 -0000	1.346
+++ system-config-printer.spec	19 Jan 2010 12:58:15 -0000	1.347
@@ -1,4 +1,4 @@
-%global pycups_version 1.9.47
+%global pycups_version 1.9.48
 %global pysmbc_version 1.0.6
 %{!?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)")}
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -32,8 +32,6 @@ Patch14: system-config-printer-userdefau
 Patch15: system-config-printer-serial-widgets.patch
 Patch16: system-config-printer-statereason-tmp.patch
 
-Patch101: pycups-request-readio.patch
-
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -109,10 +107,6 @@ printers.
 %patch15 -p1 -b .serial-widgets
 %patch16 -p1 -b .statereason-tmp
 
-pushd pycups-%{pycups_version}
-%patch101 -p1 -b .request-readio
-popd
-
 %build
 %configure --with-udev-rules --with-polkit-1
 
@@ -228,6 +222,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-10
+- Update pycups to 1.9.48.
+
 * Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
 - Clean up temporary files when localizing statereason (bug #552768).
 - Make sure serial device widgets are always initialized (bug #556488).


--- pycups-1.9.47.tar.bz2.sig DELETED ---