rpms/hplip/FC-6 .cvsignore, 1.14, 1.15 hplip-libm.patch, 1.1, 1.2 hplip.spec, 1.100, 1.101 sources, 1.14, 1.15

Wed Jan 10 17:14:31 UTC 2007

Author: twaugh

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

Modified Files:
	.cvsignore hplip-libm.patch hplip.spec sources 
Log Message:
* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 1.6.12-1
- 1.6.12.  No longer need broken-conf, loop, out-of-paper, guest or
  sane-debug patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15

--- .cvsignore	27 Oct 2006 16:43:17 -0000	1.14
+++ .cvsignore	10 Jan 2007 17:14:29 -0000	1.15
@@ -11,3 +11,4 @@
 hplip-1.6.6a.tar.gz
 hplip-1.6.7.tar.gz
 hplip-1.6.10.tar.gz
+hplip-1.6.12.tar.gz

hplip-libm.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: hplip-libm.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip-libm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-libm.patch	4 Jul 2006 15:05:08 -0000	1.1
+++ hplip-libm.patch	10 Jan 2007 17:14:29 -0000	1.2
@@ -1,22 +1,22 @@
---- hplip-1.6.6a/Makefile.in.libm	2006-07-04 15:55:53.000000000 +0100
-+++ hplip-1.6.6a/Makefile.in	2006-07-04 15:56:36.000000000 +0100
-@@ -480,7 +480,7 @@
+--- hplip-1.6.12.8-rc3/Makefile.in.libm	2006-12-12 21:25:19.000000000 +0000
++++ hplip-1.6.12.8-rc3/Makefile.in	2006-12-13 17:15:04.000000000 +0000
+@@ -509,7 +509,7 @@
      ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
-     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
+     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h 
  
 -libhpip_la_LDFLAGS = -version-info 0:1:0
 +libhpip_la_LDFLAGS = -lm -version-info 0:1:0
  
- # sane backend
- BASENAME = sane-hpaio
---- hplip-1.6.6a/Makefile.am.libm	2006-07-04 15:55:24.000000000 +0100
-+++ hplip-1.6.6a/Makefile.am	2006-07-04 15:55:36.000000000 +0100
-@@ -151,7 +151,7 @@
+ # hpaio sane backend
+ @SCAN_BUILD_TRUE at MAJORVER = 1
+--- hplip-1.6.12.8-rc3/Makefile.am.libm	2006-11-30 23:56:21.000000000 +0000
++++ hplip-1.6.12.8-rc3/Makefile.am	2006-12-13 17:16:12.000000000 +0000
+@@ -158,7 +158,7 @@
      ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \
      ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
-     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
+     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h 
 -libhpip_la_LDFLAGS = -version-info 0:1:0
 +libhpip_la_LDFLAGS = -lm -version-info 0:1:0
  
- # sane backend
- BASENAME=sane-hpaio
+ if SCAN_BUILD
+ 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- hplip.spec	6 Dec 2006 13:13:18 -0000	1.100
+++ hplip.spec	10 Jan 2007 17:14:29 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.10
-Release: 2.0.0.1%{?dist}
+Version: 1.6.12
+Release: 1%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,15 +14,10 @@
 Url: http://hplip.sourceforge.net/
 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
+Patch2: hplip-quiet.patch
+Patch3: hplip-cups-backend.patch
+Patch4: hplip-libm.patch
+Patch5: hplip-ipv6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -73,33 +68,17 @@
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
-# Don't look up username in PWDB in the fax backend (removed redundant code).
-# https://www.redhat.com/archives/fedora-list/2006-August/msg02457.html
-%patch2 -p1 -b .guest
-
 # Quieten hpssd on startup.
-%patch3 -p1 -b .quiet
+%patch2 -p1 -b .quiet
 
 # Always use /usr/lib/cups/backend.
-%patch4 -p1 -b .cups-backend
-
-# Fixed default config file (bug #211072).
-%patch5 -p1 -b .broken-conf
+%patch3 -p1 -b .cups-backend
 
 # 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
+%patch4 -p1 -b .libm
 
 # IPv6 support (bug #198377).
-%patch8 -p1 -b .ipv6
-
-# Allow debugging of the SANE backend.
-%patch9 -p1 -b .sane-debug
-
-# Report out-of-paper and offline conditions in CUPS backend (bug #216477).
-%patch10 -p1 -b .out-of-paper
+%patch5 -p1 -b .ipv6
 
 autoconf # for patch4
 
@@ -201,8 +180,9 @@
 exit 0
 
 %changelog
-* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com>
-- Reported out-of-paper and offline conditions in CUPS backend (bug #216477).
+* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 1.6.12-1
+- 1.6.12.  No longer need broken-conf, loop, out-of-paper, guest or
+  sane-debug patches.
 
 * Wed Nov  1 2006 Tim Waugh <twaugh at redhat.com> 1.6.10-1.4
 - Fixed debugging patch.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Oct 2006 16:43:17 -0000	1.14
+++ sources	10 Jan 2007 17:14:29 -0000	1.15
@@ -1 +1 @@
-01519018343978776fe4acfbdb7cb6df  hplip-1.6.10.tar.gz
+8adcb93703f6e90510f51b3cf96567c9  hplip-1.6.12.tar.gz


