rpms/hplip/devel hplip.spec, 1.130, 1.131 hplip-faxing-with-low-supplies.patch, 1.1, NONE hplip-marker-supply.patch, 1.4, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6994

Modified Files:
	hplip.spec 
Removed Files:
	hplip-faxing-with-low-supplies.patch hplip-marker-supply.patch 
Log Message:
* Wed Jun 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
- 1.7.4a.  No longer need marker-supply or faxing-with-low-supplies
  patches.  Cheetah and cherrypy directories no longer shipped in source
  tarball.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- hplip.spec	11 Jun 2007 15:55:15 -0000	1.130
+++ hplip.spec	13 Jun 2007 10:37:22 -0000	1.131
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.7.2
-Release: 11%{?dist}
+Version: 1.7.4a
+Release: 1%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,10 +19,8 @@
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
-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
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
@@ -103,18 +101,12 @@
 # IPv6 support (bug #198377).
 %patch6 -p1 -b .ipv6
 
-# Use marker-supply-low IPP message.
-%patch7 -p1 -b .marker-supply
-
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
 # Clear the media-empty-error printer state.
 %patch9 -p1 -b .media-empty
 
-# 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
 
@@ -233,8 +225,6 @@
 %{_datadir}/hplip/unload
 # Directories
 %{_datadir}/hplip/base
-%{_datadir}/hplip/Cheetah
-%{_datadir}/hplip/cherrypy
 %{_datadir}/hplip/copier
 %dir %{_datadir}/hplip/data
 %{_datadir}/hplip/data/firmware
@@ -299,6 +289,11 @@
 exit 0
 
 %changelog
+* Wed Jun 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
+- 1.7.4a.  No longer need marker-supply or faxing-with-low-supplies
+  patches.  Cheetah and cherrypy directories no longer shipped in source
+  tarball.
+
 * Mon Jun 11 2007 Tim Waugh <twaugh at redhat.com>
 - Don't ship hp-check (bug #243273).
 - Moved hp-setup back to the base package, and put code in


--- hplip-faxing-with-low-supplies.patch DELETED ---


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