diff --git a/.cvsignore b/.cvsignore index 2edc247..9a27c97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -219,3 +219,4 @@ pycups-1.9.49.tar.bz2 system-config-printer-1.2.1.tar.xz system-config-printer-1.2.2.tar.xz pysmbc-1.0.7.tar.bz2 +pycups-1.9.50.tar.bz2 diff --git a/pycups-1.9.50.tar.bz2.sig b/pycups-1.9.50.tar.bz2.sig new file mode 100644 index 0000000..6a28009 Binary files /dev/null and b/pycups-1.9.50.tar.bz2.sig differ diff --git a/sources b/sources index 7428660..2747d72 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -ac8f98a40b0fc4b6ab4470f10489887a pysmbc-1.0.6.tar.bz2 -6db9d8bc7f40315bc0b93f210737cc82 pycups-1.9.49.tar.bz2 b14021236af2d935641c27d214d4923a system-config-printer-1.2.2.tar.xz 89e6fd9129f1700eec16156bdbf60dda pysmbc-1.0.7.tar.bz2 +cae67ab1207f5ffa93edc9b5867738bb pycups-1.9.50.tar.bz2 diff --git a/system-config-printer-no-epydoc.patch b/system-config-printer-no-epydoc.patch index c826fab..deee314 100644 --- a/system-config-printer-no-epydoc.patch +++ b/system-config-printer-no-epydoc.patch @@ -26,9 +26,9 @@ diff -up system-config-printer-1.2.2/Makefile.in.no-epydoc system-config-printer distcheck-hook: update-po missing-imports -diff -up system-config-printer-1.2.2/pycups-1.9.49/Makefile.no-epydoc system-config-printer-1.2.2/pycups-1.9.49/Makefile ---- system-config-printer-1.2.2/pycups-1.9.49/Makefile.no-epydoc 2010-03-10 09:45:10.000000000 +0000 -+++ system-config-printer-1.2.2/pycups-1.9.49/Makefile 2010-05-18 12:57:39.226942671 +0100 +diff -up system-config-printer-1.2.2/pycups-1.9.50/Makefile.no-epydoc system-config-printer-1.2.2/pycups-1.9.50/Makefile +--- system-config-printer-1.2.2/pycups-1.9.50/Makefile.no-epydoc 2010-03-10 09:45:10.000000000 +0000 ++++ system-config-printer-1.2.2/pycups-1.9.50/Makefile 2010-05-18 12:57:39.226942671 +0100 @@ -14,7 +14,9 @@ cups.so: $(SOURCES) doc: cups.so diff --git a/system-config-printer.spec b/system-config-printer.spec index b20419a..c65ee86 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -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)")} @@ -20,9 +20,6 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 Patch1: system-config-printer-no-epydoc.patch Patch2: system-config-printer-cupspk-fileget-tmp.patch -Patch100: system-config-printer-pycups-build.patch -Patch101: pycups-add-getJobs-requested-attrs.patch - BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 BuildRequires: libsmbclient-devel >= 3.2 @@ -87,17 +84,6 @@ printers. # (bug #587744). %patch2 -p1 -b .cupspk-fileget-tmp -pushd pycups-%{pycups_version} - -# Fixed pycups build with new distutils. -%patch100 -p1 -b .pycups-build - -# Added optional requested_attributes argument to Connection.getJobs -# (bug #584806). -%patch101 -p1 -b .add-getJobs-requested-attrs - -popd - %build %configure --with-udev-rules @@ -138,7 +124,7 @@ rm -rf %buildroot %config(noreplace) %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/printerdriversinstaller.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 @@ -215,6 +201,7 @@ exit 0 %changelog * Tue May 18 2010 Tim Waugh - 1.2.2-3 +- Updated pycups to 1.9.50. - Updated pysmbc to 1.0.7. * Thu May 13 2010 Tim Waugh - 1.2.2-2