diff --git a/.cvsignore b/.cvsignore index d3f664f..7fe4d60 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/pycups-1.9.47.tar.bz2.sig b/pycups-1.9.47.tar.bz2.sig deleted file mode 100644 index f02be87..0000000 Binary files a/pycups-1.9.47.tar.bz2.sig and /dev/null differ diff --git a/pycups-1.9.48.tar.bz2.sig b/pycups-1.9.48.tar.bz2.sig new file mode 100644 index 0000000..6ab9fa9 Binary files /dev/null and b/pycups-1.9.48.tar.bz2.sig differ diff --git a/sources b/sources index 9cc2552..9eb3ce9 100644 --- a/sources +++ b/sources @@ -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 diff --git a/system-config-printer-no-epydoc.patch b/system-config-printer-no-epydoc.patch index 4d95b04..e3d5225 100644 --- a/system-config-printer-no-epydoc.patch +++ b/system-config-printer-no-epydoc.patch @@ -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/Makefile.am.no-epydoc system-config-printe 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/Makefile.in.no-epydoc system-config-printe 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/pycups-1.9.47/Makefile.no-epydoc system-co 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 diff --git a/system-config-printer.spec b/system-config-printer.spec index 7811a18..7be7288 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -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-userdefault-traceback.patch 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 - 1.1.16-10 +- Update pycups to 1.9.48. + * Mon Jan 18 2010 Tim Waugh - 1.1.16-9 - Clean up temporary files when localizing statereason (bug #552768). - Make sure serial device widgets are always initialized (bug #556488).