diff --git a/system-config-printer-forbidden.patch b/system-config-printer-forbidden.patch deleted file mode 100644 index facb24a..0000000 --- a/system-config-printer-forbidden.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up system-config-printer-1.0.7/authconn.py.forbidden system-config-printer-1.0.7/authconn.py ---- system-config-printer-1.0.7/authconn.py.forbidden 2008-08-29 11:32:49.000000000 +0100 -+++ system-config-printer-1.0.7/authconn.py 2008-08-30 10:42:09.000000000 +0100 -@@ -164,7 +164,8 @@ class Connection: - raise cups.IPPError (cups.IPP_NOT_AUTHORIZED, '') - break - except cups.IPPError, (e, m): -- if not self._cancel and e == cups.IPP_NOT_AUTHORIZED: -+ if not self._cancel and (e == cups.IPP_NOT_AUTHORIZED or -+ e == cups.IPP_FORBIDDEN): - self._failed () - else: - raise -diff -U0 system-config-printer-1.0.7/ChangeLog.forbidden system-config-printer-1.0.7/ChangeLog ---- system-config-printer-1.0.7/ChangeLog.forbidden 2008-08-29 11:32:49.000000000 +0100 -+++ system-config-printer-1.0.7/ChangeLog 2008-08-30 10:42:09.000000000 +0100 -@@ -0,0 +1,5 @@ -+2008-08-30 Tim Waugh -+ -+ * authconn.py (Connection._authloop): Handle IPP_FORBIDDEN (bug -+ #460670). -+ diff --git a/system-config-printer.spec b/system-config-printer.spec index 31e3fed..0c66107 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -15,8 +15,6 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config- Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2 -Patch1: system-config-printer-forbidden.patch - BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 BuildRequires: libsmbclient-devel >= 3.2 @@ -62,7 +60,6 @@ the configuration tool. %prep %setup -q -a 1 -a 2 -%patch1 -p1 -b .forbidden %build %configure