diff --git a/hplip-quit.patch b/hplip-quit.patch new file mode 100644 index 0000000..3300510 --- /dev/null +++ b/hplip-quit.patch @@ -0,0 +1,11 @@ +diff -up hplip-2.8.12/ui4/devmgr5.py.quit hplip-2.8.12/ui4/devmgr5.py +--- hplip-2.8.12/ui4/devmgr5.py.quit 2009-01-13 17:44:34.000000000 +0000 ++++ hplip-2.8.12/ui4/devmgr5.py 2009-01-13 17:45:07.000000000 +0000 +@@ -212,6 +212,7 @@ class DevMgr5(QMainWindow, Ui_MainWindo + self.ContentsAction.setIcon(QIcon(load_pixmap("help", "16x16"))) + self.connect(self.ContentsAction, SIGNAL("triggered()"), self.helpContents) + ++ self.connect(self.QuitAction, SIGNAL("triggered()"), self.close) + + + # Init tabs/controls diff --git a/hplip.spec b/hplip.spec index 2e26bba..c7ff5ac 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 2.8.12 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -16,6 +16,7 @@ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar Source1: hplip.fdi Patch1: hplip-desktop.patch Patch2: hplip-segfault.patch +Patch3: hplip-quit.patch Patch4: hplip-marker-supply.patch Patch5: hplip-dbus.patch Patch6: hplip-systray.patch @@ -109,6 +110,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # set (bug #479808 comment 6). %patch2 -p1 -b .segfault +# Fixed Quit menu item in device manager (bug #479751). +%patch3 -p1 -b .quit + # Low ink is a warning condition, not an error. %patch4 -p1 -b .marker-supply @@ -322,6 +326,9 @@ fi exit 0 %changelog +* Tue Jan 13 2009 Tim Waugh 2.8.12-5 +- Fixed Quit menu item in device manager (bug #479751). + * Tue Jan 13 2009 Tim Waugh 2.8.12-4 - Prevent crash when DEVICE_URI/PRINTER environment variables are not set (bug #479808 comment 6).