rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- 3.9.2. No longer need systray or quit patches.

Browse Source
This commit is contained in:
Tim Waugh 2009-02-20 13:13:49 +00:00
parent 8e74cb75b3
commit ad006f5a23
7 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -27,3 +27,4 @@ hplip-2.8.6b.tar.gz
hplip-2.8.7.tar.gz
hplip-2.8.10.tar.gz
hplip-2.8.12.tar.gz
hplip-3.9.2.tar.gz

20
hplip-libsane.patch
View File

@ -1,24 +1,24 @@
diff -up hplip-2.8.10/Makefile.am.libsane hplip-2.8.10/Makefile.am
--- hplip-2.8.10/Makefile.am.libsane 2008-10-31 22:25:17.000000000 +0000
+++ hplip-2.8.10/Makefile.am 2008-12-11 12:26:58.000000000 +0000
@@ -194,7 +194,7 @@ else
diff -up hplip-3.9.2/Makefile.am.libsane hplip-3.9.2/Makefile.am
--- hplip-3.9.2/Makefile.am.libsane 2009-02-20 00:36:58.000000000 +0000
+++ hplip-3.9.2/Makefile.am 2009-02-20 11:10:19.000000000 +0000
@@ -195,7 +195,7 @@ else
libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
endif
# The following is a interlibrary dependency that must be compiled first.
-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
diff -up hplip-2.8.10/Makefile.in.libsane hplip-2.8.10/Makefile.in
--- hplip-2.8.10/Makefile.in.libsane 2008-10-31 22:27:27.000000000 +0000
+++ hplip-2.8.10/Makefile.in 2008-12-11 12:26:58.000000000 +0000
@@ -2653,7 +2653,7 @@ dist_unrel_DATA =
diff -up hplip-3.9.2/Makefile.in.libsane hplip-3.9.2/Makefile.in
--- hplip-3.9.2/Makefile.in.libsane 2009-02-20 00:37:52.000000000 +0000
+++ hplip-3.9.2/Makefile.in 2009-02-20 11:10:42.000000000 +0000
@@ -3933,7 +3933,7 @@ dist_unrel_DATA =
@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first.
-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)

38
hplip-no-root-config.patch
View File

@ -1,10 +1,21 @@
diff -up hplip-2.8.12/base/g.py.no-root-config hplip-2.8.12/base/g.py
--- hplip-2.8.12/base/g.py.no-root-config 2008-12-17 20:41:12.000000000 +0000
+++ hplip-2.8.12/base/g.py 2009-01-12 12:22:31.000000000 +0000
@@ -91,6 +91,15 @@ class ConfigSection(dict):
diff -up hplip-3.9.2/base/g.py.no-root-config hplip-3.9.2/base/g.py
--- hplip-3.9.2/base/g.py.no-root-config 2009-02-20 00:36:51.000000000 +0000
+++ hplip-3.9.2/base/g.py 2009-02-20 11:13:28.000000000 +0000
@@ -110,6 +110,10 @@ class ConfigBase(object):
keys = options
self.config_obj.set(self.section_name, option, val)
def read(self):
+ if filename.startswith ("/root/") or filename.startswith ("/var/"):
+ # Don't try opening a file in root's home directory.
+ return
+
if self.filename is not None:
try:
fp = open(self.filename, "r")
@@ -119,6 +123,15 @@ class ConfigBase(object):
log.debug("Unable to open file %s for reading." % self.filename)
def write(self):
+ filename = self.filename
+ if filename.startswith ("/root/") or filename.startswith ("/var/"):
+ # Don't try writing a file in root's home directory.
@ -14,17 +25,6 @@ diff -up hplip-2.8.12/base/g.py.no-root-config hplip-2.8.12/base/g.py
+ # See bug #479178.
+ return
+
try:
f = file(self.filename, 'w')
self.config_obj.write(f)
@@ -107,6 +116,10 @@ class Config(dict):
log.debug("Reading config file %s" % filename)
+ if filename.startswith ("/root/") or filename.startswith ("/var/"):
+ # Don't try opening a file in root's home directory.
+ return
+
try:
f = file(filename, 'r')
self.config_obj.readfp(f)
if self.filename is not None:
try:
fp = open(self.filename, "w")

11
hplip-quit.patch
View File

@ -1,11 +0,0 @@
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

13
hplip-systray.patch
View File

@ -1,13 +0,0 @@
diff -up hplip-2.8.10/base/module.py.systray hplip-2.8.10/base/module.py
--- hplip-2.8.10/base/module.py.systray 2008-12-11 12:05:42.000000000 +0000
+++ hplip-2.8.10/base/module.py 2008-12-11 12:05:46.000000000 +0000
@@ -57,7 +57,7 @@ class Module(object):
self.avail_modes = avail_modes
self.supported_ui_toolkits = supported_ui_toolkits
- self.default_ui_toolkit = sys_cfg.configure.get('ui-toolkit', 'qt3')
+ self.default_ui_toolkit = sys_cfg.configure.get('ui-toolkit', 'qt4')
self.default_mode = INTERACTIVE_MODE
diff -up hplip-2.8.10/systray.py.systray hplip-2.8.10/systray.py

21
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 2.8.12
Release: 7%{?dist}
Version: 3.9.2
Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -16,10 +16,9 @@ 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
Patch6: hplip-strstr-const.patch
Patch8: hplip-libsane.patch
Patch12: hplip-no-root-config.patch
Patch13: hplip-ui-optional.patch
@ -110,18 +109,14 @@ 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
# Prevent backend crash when D-Bus not running (bug #474362).
%patch5 -p1 -b .dbus
# Make --qt4 the default for the systray applet, so that it appears
# in the right place.
%patch6 -p1 -b .systray
# Fix compilation.
%patch6 -p1 -b .strstr-const
# Link libsane-hpaio against libsane (bug #234813).
%patch8 -p1 -b .libsane
@ -216,6 +211,7 @@ rm -rf %{buildroot}
%{_bindir}/hp-pqdiag
%{_bindir}/hp-printsettings
%{_bindir}/hp-probe
%{_bindir}/hp-query
%{_bindir}/hp-scan
%{_bindir}/hp-sendfax
%{_bindir}/hp-setup
@ -248,6 +244,7 @@ rm -rf %{buildroot}
%{_datadir}/hplip/pqdiag.py*
%{_datadir}/hplip/printsettings.py*
%{_datadir}/hplip/probe.py*
%{_datadir}/hplip/query.py*
%{_datadir}/hplip/scan.py*
%{_datadir}/hplip/sendfax.py*
%{_datadir}/hplip/setup.py*
@ -267,6 +264,7 @@ rm -rf %{buildroot}
%{_datadir}/hplip/pcard
%{_datadir}/hplip/prnt
%{_datadir}/hplip/scan
%{_localstatedir}/lib/hp
%files libs
%defattr(-,root,root)
@ -328,6 +326,9 @@ fi
exit 0
%changelog
* Fri Feb 20 2009 Tim Waugh <twaugh@redhat.com> 3.9.2-1
- 3.9.2. No longer need systray or quit patches.
* Tue Jan 27 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-7
- Only ship compressed PPD files.

2
sources
View File

@ -1 +1 @@
f6d04d4ed5c41e3e1c84e6a7af6b8db7 hplip-2.8.12.tar.gz
581224f556a23ac5545dde541b6f54ca hplip-3.9.2.tar.gz