rpms/hplip/F-8 .cvsignore, 1.21, 1.22 hplip.spec, 1.169, 1.170 sources, 1.21, 1.22 hplip-alloc.patch, 1.1, NONE hplip-media-empty.patch, 1.4, NONE hplip-unload-traceback.patch, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16077

Modified Files:
	.cvsignore hplip.spec sources 
Removed Files:
	hplip-alloc.patch hplip-media-empty.patch 
	hplip-unload-traceback.patch 
Log Message:
* Tue Mar  4 2008 Tim Waugh <twaugh at redhat.com> 2.8.2-1
- 2.8.2.  No longer need alloc, unload-traceback or media-empty patches.
- Ship cupsddk driver.  The hpijs sub-package now requires cupsddk-drivers.
- Fixed marker-supply-low strings.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	18 Jan 2008 15:16:12 -0000	1.21
+++ .cvsignore	4 Mar 2008 18:21:36 -0000	1.22
@@ -18,3 +18,4 @@
 hplip-2.7.6.tar.gz
 hplip-2.7.7.tar.gz
 hplip-2.7.12.tar.gz
+hplip-2.8.2.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/hplip.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- hplip.spec	4 Mar 2008 16:51:19 -0000	1.169
+++ hplip.spec	4 Mar 2008 18:21:36 -0000	1.170
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.7.12
-Release: 4%{?dist}
+Version: 2.8.2
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,10 +19,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
-Patch6: hplip-alloc.patch
 Patch8: hplip-libsane.patch
-Patch9: hplip-media-empty.patch
-Patch11: hplip-unload-traceback.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +68,7 @@
 Epoch: %{hpijs_epoch}
 Requires: python-reportlab
 Requires: net-snmp
+Requires: cupsddk-drivers
 
 %description -n hpijs
 hpijs is a collection of optimized drivers for HP printers.
@@ -109,18 +107,9 @@
 # libhpip should link against libm (bug #197599).
 %patch5 -p1 -b .libm
 
-# The hpijs compression module doesn't allocate enough memory (bug #428536).
-%patch6 -p1 -b .alloc
-
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
-# Clear the media-empty-error printer state.
-%patch9 -p1 -b .media-empty
-
-# Prevent a traceback when unloading a photo card (bug #238617).
-%patch11 -p1 -b .unload-traceback
-
 # Prevent SELinux audit message from the CUPS backends (bug #241776)
 %patch12 -p1 -b .no-root-config
 
@@ -131,7 +120,8 @@
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
-	--enable-scan-build --enable-gui-build --enable-fax-build
+	--enable-scan-build --enable-gui-build --enable-fax-build \
+	--disable-foomatic-rip-hplip-install
 make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 %install
@@ -257,6 +247,7 @@
 %{_libdir}/libhpmud.so*
 %{_bindir}/hpijs
 %{_datadir}/foomatic/db/source/PPD/HP
+%{_datadir}/cups/drv/*
 
 %files -n libsane-hpaio
 %defattr(-,root,root)
@@ -284,7 +275,9 @@
 exit 0
 
 %changelog
-* Tue Mar  4 2008 Tim Waugh <twaugh at redhat.com>
+* Tue Mar  4 2008 Tim Waugh <twaugh at redhat.com> 2.8.2-1
+- 2.8.2.  No longer need alloc, unload-traceback or media-empty patches.
+- Ship cupsddk driver.  The hpijs sub-package now requires cupsddk-drivers.
 - Fixed marker-supply-low strings.
 
 * Fri Jan 25 2008 Tim Waugh <twaugh at redhat.com> 2.7.12-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-8/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	18 Jan 2008 15:16:12 -0000	1.21
+++ sources	4 Mar 2008 18:21:36 -0000	1.22
@@ -1 +1 @@
-ba00337ccf1b520509518bffbec960db  hplip-2.7.12.tar.gz
+ea57b92483622d3eae359994c5fd3dc3  hplip-2.8.2.tar.gz


--- hplip-alloc.patch DELETED ---


--- hplip-media-empty.patch DELETED ---


--- hplip-unload-traceback.patch DELETED ---