diff --git a/hplip-2.7.6-1.patch b/hplip-2.7.6-1.patch new file mode 100644 index 0000000..5df2c05 --- /dev/null +++ b/hplip-2.7.6-1.patch @@ -0,0 +1,11 @@ +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. diff --git a/hplip.spec b/hplip.spec index 47724bc..a7ce2b7 100644 --- a/hplip.spec +++ b/hplip.spec @@ -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 @@ Conflicts: selinux-policy < 3.0.1-4.fc8 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(preun): /sbin/chkconfig Requires: hpijs = %{hpijs_epoch}:%{version}-%{release} Requires: python-imaging -Requires: python-reportlab BuildRequires: net-snmp-devel BuildRequires: cups-devel @@ -65,6 +65,7 @@ Summary: HP Printer Drivers 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 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). %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 @@ fi exit 0 %changelog +* Mon Jul 9 2007 Tim Waugh 2.7.6-4 +- Moved reportlab requirement to gui sub-package (bug #189030). +- Patchlevel 1. + * Sat Jul 7 2007 Tim Waugh 2.7.6-3 - Fixed pre scriptlet (bug #247349, bug #247322).