diff --git a/hplip-unload-traceback.patch b/hplip-unload-traceback.patch new file mode 100644 index 0000000..d0e4716 --- /dev/null +++ b/hplip-unload-traceback.patch @@ -0,0 +1,17 @@ +--- hplip-1.7.2/ui/scrollfunc.py.unload-traceback 2007-05-10 12:13:17.000000000 +0100 ++++ hplip-1.7.2/ui/scrollfunc.py 2007-05-10 12:13:58.000000000 +0100 +@@ -176,5 +176,14 @@ + self.addControl(widget, str(title)) + + ++ def FailureUI(self, error_text): ++ log.error(str(error_text).replace("", "").replace("", "").replace("
", ""))
++ QMessageBox.critical(self,
++ self.caption(),
++ error_text,
++ QMessageBox.Ok,
++ QMessageBox.NoButton,
++ QMessageBox.NoButton)
++
+ def __tr(self,s,c = None):
+ return qApp.translate("DevMgr4",s,c)
diff --git a/hplip.spec b/hplip.spec
index 36bc1fa..d89fe46 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 1.7.2
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPL/MIT/BSD
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -23,6 +23,7 @@ Patch7: hplip-marker-supply.patch
Patch8: hplip-libsane.patch
Patch9: hplip-media-empty.patch
Patch10: hplip-faxing-with-low-supplies.patch
+Patch11: hplip-unload-traceback.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires(post): /sbin/service
@@ -112,6 +113,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# When faxing, low ink/paper is not a problem (bug #238664).
%patch10 -p1 -b .faxing-with-low-supplies
+# Prevent a traceback when unloading a photo card (bug #238617).
+%patch11 -p1 -b .unload-traceback
+
autoconf # for patch4
%build
@@ -287,6 +291,9 @@ fi
exit 0
%changelog
+* Thu May 10 2007 Tim Waugh