rpms/hplip/devel hplip.spec, 1.103, 1.104 hplip-broken-conf.patch, 1.1, NONE hplip-loop.patch, 1.1, NONE hplip-out-of-paper.patch, 1.3, NONE hplip-sane-debug.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25088

Modified Files:
	hplip.spec 
Removed Files:
	hplip-broken-conf.patch hplip-loop.patch 
	hplip-out-of-paper.patch hplip-sane-debug.patch 
Log Message:
* Wed Jan 10 2007 Tim Waugh <twaugh at redhat.com> 1.6.12-1
- 1.6.12.



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- hplip.spec	10 Jan 2007 15:58:14 -0000	1.103
+++ hplip.spec	10 Jan 2007 16:14:44 -0000	1.104
@@ -12,17 +12,13 @@
 Conflicts: selinux-policy < 2.3.4-1
 
 Url: http://hplip.sourceforge.net/
-Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.8-rc3.tar.gz
+Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Patch1: hplip-desktop.patch
 Patch2: hplip-guest.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
-Patch5: hplip-broken-conf.patch
-Patch6: hplip-libm.patch
-Patch7: hplip-loop.patch
-Patch8: hplip-ipv6.patch
-Patch9: hplip-sane-debug.patch
-Patch10: hplip-out-of-paper.patch
+Patch5: hplip-libm.patch
+Patch6: hplip-ipv6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -67,8 +63,8 @@
 SANE driver for scanners in HP's multi-function devices (from HPOJ).
 
 %prep
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}.8-rc3
-%setup -n %{name}-%{version}.8-rc3 -q
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+%setup -q
 
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
@@ -79,20 +75,11 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
-# Fixed default config file (bug #211072).
-%patch5 -p1 -b .broken-conf
-
 # libhpip should link against libm (bug #197599).
-%patch6 -p1 -b .libm
-
-# Don't wake up every half a second (bug #204725).
-%patch7 -p1 -b .loop
+%patch5 -p1 -b .libm
 
 # IPv6 support (bug #198377).
-%patch8 -p1 -b .ipv6
-
-# Report out-of-paper and offline conditions in CUPS backend (bug #216477).
-%patch10 -p1 -b .out-of-paper
+%patch6 -p1 -b .ipv6
 
 autoconf # for patch4
 
@@ -195,7 +182,8 @@
 
 %changelog
 * Wed Jan 10 2007 Tim Waugh <twaugh at redhat.com> 1.6.12-1
-- 1.6.12.
+- 1.6.12.  No longer need broken-conf, loop, out-of-paper or
+  sane-debug patches.
 
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 1.6.10-7
 - rebuild against python 2.5


--- hplip-broken-conf.patch DELETED ---


--- hplip-loop.patch DELETED ---


--- hplip-out-of-paper.patch DELETED ---


--- hplip-sane-debug.patch DELETED ---