rpms/hplip/F-7 .cvsignore, 1.17, 1.18 hplip-desktop.patch, 1.1, 1.2 hplip.spec, 1.133, 1.134 sources, 1.17, 1.18 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/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7622

Modified Files:
	.cvsignore hplip-desktop.patch hplip.spec sources 
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
- Don't put the version in the desktop file; let desktop-file-install do it.
- 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Mar 2007 10:01:30 -0000	1.17
+++ .cvsignore	13 Jun 2007 16:43:50 -0000	1.18
@@ -14,3 +14,4 @@
 hplip-1.6.12.tar.gz
 hplip-1.7.1.tar.gz
 hplip-1.7.2.tar.gz
+hplip-1.7.4a.tar.gz

hplip-desktop.patch:

Index: hplip-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-desktop.patch	9 Jun 2005 15:36:47 -0000	1.1
+++ hplip-desktop.patch	13 Jun 2007 16:43:50 -0000	1.2
@@ -24,3 +24,23 @@
  
  echo "$as_me:$LINENO: checking \"for icon directory\"" >&5
  echo $ECHO_N "checking \"for icon directory\"... $ECHO_C" >&6
+--- hplip-1.7.4a/Makefile.am.desktop	2007-06-13 13:10:17.000000000 +0100
++++ hplip-1.7.4a/Makefile.am	2007-06-13 13:10:50.000000000 +0100
+@@ -295,7 +295,6 @@
+ #       Create ICON file in srcdir.
+ 	if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \
+ 	   echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
+-	   echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
+--- hplip-1.7.4a/Makefile.in.desktop	2007-06-13 13:10:22.000000000 +0100
++++ hplip-1.7.4a/Makefile.in	2007-06-13 13:10:59.000000000 +0100
+@@ -2770,7 +2770,6 @@
+ #       Create ICON file in srcdir.
+ 	if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \
+ 	   echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
+-	   echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- hplip.spec	11 Jun 2007 14:49:22 -0000	1.133
+++ hplip.spec	13 Jun 2007 16:43:50 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.7.2
-Release: 13%{?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,12 @@
 exit 0
 
 %changelog
+* Wed Jun 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
+- Don't put the version in the desktop file; let desktop-file-install do it.
+- 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> 1.7.2-13
 - Don't ship hp-check (bug #243273).
 - Moved hp-setup back to the base package, and put code in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Mar 2007 10:01:30 -0000	1.17
+++ sources	13 Jun 2007 16:43:50 -0000	1.18
@@ -1 +1 @@
-739a9cef41ca655ad98bc35a39c0517e  hplip-1.7.2.tar.gz
+210e948d1f1f376426a2cca0ed9d1e6c  hplip-1.7.4a.tar.gz


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


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