rpms/hplip/devel .cvsignore, 1.30, 1.31 hplip-libsane.patch, 1.4, 1.5 hplip-no-root-config.patch, 1.8, 1.9 hplip.spec, 1.198, 1.199 sources, 1.30, 1.31 hplip-quit.patch, 1.1, NONE hplip-systray.patch, 1.2, NONE
Tim Waugh
twaugh at fedoraproject.org
Fri Feb 20 13:14:19 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24120
Modified Files:
.cvsignore hplip-libsane.patch hplip-no-root-config.patch
hplip.spec sources
Removed Files:
hplip-quit.patch hplip-systray.patch
Log Message:
* Fri Feb 20 2009 Tim Waugh <twaugh at redhat.com> 3.9.2-1
- 3.9.2. No longer need systray or quit patches.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 23 Dec 2008 11:46:29 -0000 1.30
+++ .cvsignore 20 Feb 2009 13:13:49 -0000 1.31
@@ -27,3 +27,4 @@
hplip-2.8.7.tar.gz
hplip-2.8.10.tar.gz
hplip-2.8.12.tar.gz
+hplip-3.9.2.tar.gz
hplip-libsane.patch:
Index: hplip-libsane.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-libsane.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hplip-libsane.patch 11 Dec 2008 12:28:29 -0000 1.4
+++ hplip-libsane.patch 20 Feb 2009 13:13:49 -0000 1.5
@@ -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 at libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first.
- at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+ at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at 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 at libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
hplip-no-root-config.patch:
Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-root-config.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hplip-no-root-config.patch 12 Jan 2009 18:41:08 -0000 1.8
+++ hplip-no-root-config.patch 20 Feb 2009 13:13:49 -0000 1.9
@@ -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 @@
+ # 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")
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- hplip.spec 27 Jan 2009 11:24:41 -0000 1.198
+++ hplip.spec 20 Feb 2009 13:13:49 -0000 1.199
@@ -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 @@
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 @@
# 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 @@
%{_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 @@
%{_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 @@
%{_datadir}/hplip/pcard
%{_datadir}/hplip/prnt
%{_datadir}/hplip/scan
+%{_localstatedir}/lib/hp
%files libs
%defattr(-,root,root)
@@ -328,6 +326,9 @@
exit 0
%changelog
+* Fri Feb 20 2009 Tim Waugh <twaugh at redhat.com> 3.9.2-1
+- 3.9.2. No longer need systray or quit patches.
+
* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-7
- Only ship compressed PPD files.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 23 Dec 2008 11:46:29 -0000 1.30
+++ sources 20 Feb 2009 13:13:49 -0000 1.31
@@ -1 +1 @@
-f6d04d4ed5c41e3e1c84e6a7af6b8db7 hplip-2.8.12.tar.gz
+581224f556a23ac5545dde541b6f54ca hplip-3.9.2.tar.gz
--- hplip-quit.patch DELETED ---
--- hplip-systray.patch DELETED ---
More information about the fedora-extras-commits
mailing list