rpms/hplip/devel hplip-2.7.6-1.patch, NONE, 1.1 hplip.spec, 1.140, 1.141

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-2.7.6-1.patch 
Log Message:
* Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-4
- Moved reportlab requirement to gui sub-package (bug #189030).
- Patchlevel 1.


hplip-2.7.6-1.patch:

--- NEW FILE hplip-2.7.6-1.patch ---
diff -uNr hplip-2.7.6.old/prnt/hpijs/djgenericvip.h hplip-2.7.6.new/prnt/hpijs/djgenericvip.h
--- hplip-2.7.6.old/prnt/hpijs/djgenericvip.h	2007-07-06 10:31:25.000000000 -0700
+++ hplip-2.7.6.new/prnt/hpijs/djgenericvip.h	2007-07-06 10:48:25.000000000 -0700
@@ -52,6 +52,7 @@
     virtual PHOTOTRAY_STATE PhotoTrayEngaged (BOOL bQueryPrinter);
     //! Returns TRUE if a hagaki feed is present in printer.
     virtual BOOL HagakiFeedPresent(BOOL bQueryPrinter);
+	virtual DATA_FORMAT GetDataFormat () { return RASTER_STRIP; }
 
 #ifdef APDK_AUTODUPLEX
     //!Returns TRUE if duplexer and hagaki feed (combined) unit is present in printer.


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- hplip.spec	7 Jul 2007 15:54:45 -0000	1.140
+++ hplip.spec	9 Jul 2007 09:49:20 -0000	1.141
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,6 +13,7 @@
 
 Url: http://hplip.sourceforge.net/
 Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Patch0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-2.7.6-1.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-guest.patch
 Patch3: hplip-quiet.patch
@@ -33,7 +34,6 @@
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
 Requires: python-imaging
-Requires: python-reportlab
 
 BuildRequires: net-snmp-devel
 BuildRequires: cups-devel
@@ -65,6 +65,7 @@
 Group: Applications/Publishing
 License: BSD
 Epoch: %{hpijs_epoch}
+Requires: python-reportlab
 
 %description -n hpijs
 hpijs is a collection of optimized drivers for HP printers.
@@ -86,6 +87,7 @@
 %prep
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
+%patch0 -p1 -b .patchlevel1
 
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
@@ -264,6 +266,10 @@
 exit 0
 
 %changelog
+* Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-4
+- Moved reportlab requirement to gui sub-package (bug #189030).
+- Patchlevel 1.
+
 * Sat Jul  7 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-3
 - Fixed pre scriptlet (bug #247349, bug #247322).