rpms/hplip/devel hplip-3.9.8.tar.gz.asc, NONE, 1.1 .cvsignore, 1.32, 1.33 hplip.spec, 1.214, 1.215 sources, 1.32, 1.33 hplip-dbus.patch, 1.1, NONE hplip-desktop.patch, 1.7, NONE hplip-device-id.patch, 1.4, NONE hplip-disc-media.patch, 1.2, NONE hplip-libsane.patch, 1.6, NONE hplip-marker-supply.patch, 1.9, NONE hplip-no-root-config.patch, 1.10, NONE hplip-resolution-405400.patch, 1.1, NONE hplip-segfault.patch, 1.2, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21471

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-3.9.8.tar.gz.asc 
Removed Files:
	hplip-dbus.patch hplip-desktop.patch hplip-device-id.patch 
	hplip-disc-media.patch hplip-libsane.patch 
	hplip-marker-supply.patch hplip-no-root-config.patch 
	hplip-resolution-405400.patch hplip-segfault.patch 
Log Message:
* Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
- 3.9.8.



--- NEW FILE hplip-3.9.8.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkp4q+sACgkQhA7anpATwAWrnwCeNjw4P14Md8GsBRtbgLo+Hr6M
nwMAoJoSt8h4xjpXdmEWuhoFie0drfBT
=pkCz
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	27 Jul 2009 18:23:08 -0000	1.32
+++ .cvsignore	5 Aug 2009 17:26:00 -0000	1.33
@@ -29,3 +29,4 @@ hplip-2.8.10.tar.gz
 hplip-2.8.12.tar.gz
 hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
+hplip-3.9.8.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- hplip.spec	4 Aug 2009 10:03:53 -0000	1.214
+++ hplip.spec	5 Aug 2009 17:26:01 -0000	1.215
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.6b
-Release: 5%{?dist}
+Version: 3.9.8
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,17 +14,8 @@ Conflicts: selinux-policy < 3.0.3-3
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
-Patch1: hplip-desktop.patch
-Patch2: hplip-segfault.patch
-Patch3: hplip-device-id.patch
-Patch4: hplip-marker-supply.patch
-Patch5: hplip-dbus.patch
-Patch6: hplip-strstr-const.patch
-Patch8: hplip-libsane.patch
-Patch12: hplip-no-root-config.patch
-Patch13: hplip-ui-optional.patch
-Patch14: hplip-disc-media.patch
-Patch15: hplip-resolution-405400.patch
+Patch1: hplip-strstr-const.patch
+Patch2: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -106,47 +97,11 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fix desktop file.
-%patch1 -p1 -b .desktop
-
-# Prevent crash when DEVICE_URI/PRINTER environment variables are not
-# set (bug #479808 comment 6).
-%patch2 -p1 -b .segfault
-
-# Fixed device-id attributes reported by backend.
-%patch3 -p1 -b .device-id
-
-# 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
-
 # Fix compilation.
-%patch6 -p1 -b .strstr-const
-
-# Link libsane-hpaio against libsane (bug #234813).
-%patch8 -p1 -b .libsane
-
-# Prevent SELinux audit message from the CUPS backends (bug #241776)
-%patch12 -p1 -b .no-root-config
+%patch1 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
-%patch13 -p1 -b .ui-optional
-
-# Set disc media for disc page sizes (bug #495672).
-%patch14 -p1 -b .disc-media
-
-# Fixed HWResolution for 'Normal' output from the hpcups driver
-# (laundpad bug #405400).
-%patch15 -p1 -b .resolution-405400
-
-# Fix hpcups fax PPDs (bug #515356)
-pushd fax/ppd
-gunzip *hpcups*
-perl -pi -e 's/^(\*Product:.*\")(.*)\"/\1(\2)"/' *hpcups*
-gzip -n *hpcups*
-popd
+%patch2 -p1 -b .ui-optional
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
@@ -355,6 +310,9 @@ fi
 exit 0
 
 %changelog
+* Wed Aug  5 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-1
+- 3.9.8.
+
 * Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-5
 - Fix hpcups fax PPDs (bug #515356)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Jul 2009 18:23:08 -0000	1.32
+++ sources	5 Aug 2009 17:26:01 -0000	1.33
@@ -1 +1 @@
-49a87fe7d7a57a075ed9631113cee662  hplip-3.9.6b.tar.gz
+cb1cf49c5f062993b78fc2768f531ed8  hplip-3.9.8.tar.gz


--- hplip-dbus.patch DELETED ---


--- hplip-desktop.patch DELETED ---


--- hplip-device-id.patch DELETED ---


--- hplip-disc-media.patch DELETED ---


--- hplip-libsane.patch DELETED ---


--- hplip-marker-supply.patch DELETED ---


--- hplip-no-root-config.patch DELETED ---


--- hplip-resolution-405400.patch DELETED ---


--- hplip-segfault.patch DELETED ---