rpms/hplip/FC-6 hplip-broken-conf.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 hplip.spec, 1.94, 1.95 sources, 1.13, 1.14 hplip-compile.patch, 1.5, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-broken-conf.patch 
Removed Files:
	hplip-compile.patch 
Log Message:
* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com> 1.6.10-1.1
- 1.6.10.  No longer need compile patch.
- Fixed default config file (bug #211072).
- Resolves: rhbz#211072


hplip-broken-conf.patch:
 hplip.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hplip-broken-conf.patch ---
--- hplip-1.6.10/hplip.conf.broken-conf	2006-10-27 17:32:09.000000000 +0100
+++ hplip-1.6.10/hplip.conf	2006-10-27 17:32:16.000000000 +0100
@@ -2,7 +2,7 @@
 
 [hpiod]
 # port=0 (dynamic IP port)
-port=2208 (IANA IP port)
+port=2208
 [hpssd]
 # port=0 (dynamic IP port)
-port=2207 (IANA IP port)
+port=2207


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Aug 2006 09:59:22 -0000	1.13
+++ .cvsignore	27 Oct 2006 16:43:17 -0000	1.14
@@ -10,3 +10,4 @@
 hplip-1.6.6.tar.gz
 hplip-1.6.6a.tar.gz
 hplip-1.6.7.tar.gz
+hplip-1.6.10.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- hplip.spec	29 Sep 2006 15:45:14 -0000	1.94
+++ hplip.spec	27 Oct 2006 16:43:17 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.7
-Release: 4
+Version: 1.6.10
+Release: 1%{?dist}.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -17,7 +17,7 @@
 Patch2: hplip-guest.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
-Patch5: hplip-compile.patch
+Patch5: hplip-broken-conf.patch
 Patch6: hplip-libm.patch
 Patch7: hplip-loop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -80,8 +80,8 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
-# Work around missing linux/compiler.h.
-%patch5 -p1 -b .compile
+# Fixed default config file (bug #211072).
+%patch5 -p1 -b .broken-conf
 
 # libhpip should link against libm (bug #197599).
 %patch6 -p1 -b .libm
@@ -189,6 +189,10 @@
 exit 0
 
 %changelog
+* Fri Oct 27 2006 Tim Waugh <twaugh at redhat.com> 1.6.10-1.1
+- 1.6.10.  No longer need compile patch.
+- Fixed default config file (bug #211072).
+
 * Fri Sep 29 2006 Tim Waugh <twaugh at redhat.com> 1.6.7-4
 - Don't wake up every half a second (bug #204725).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Aug 2006 09:59:22 -0000	1.13
+++ sources	27 Oct 2006 16:43:17 -0000	1.14
@@ -1 +1 @@
-b1e814c7f5ef2a5033e4c3e5162ac694  hplip-1.6.7.tar.gz
+01519018343978776fe4acfbdb7cb6df  hplip-1.6.10.tar.gz


--- hplip-compile.patch DELETED ---