rpms/hplip/FC-5 hplip-compile.patch, 1.4, 1.5 .cvsignore, 1.9, 1.10 hplip.spec, 1.72, 1.73 sources, 1.10, 1.11 hplip-0.9.11-2.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-compile.patch 
Removed Files:
	hplip-0.9.11-2.patch 
Log Message:
* Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-1.1
- 1.6.6.


hplip-compile.patch:
 usbext.h |    1 -
 1 files changed, 1 deletion(-)

Index: hplip-compile.patch
===================================================================
RCS file: hplip-compile.patch
diff -N hplip-compile.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-compile.patch	16 Jun 2006 11:41:43 -0000	1.5
@@ -0,0 +1,10 @@
+--- hplip-1.6.6/io/hpiod/usbext.h.compile	2006-06-16 12:18:21.000000000 +0100
++++ hplip-1.6.6/io/hpiod/usbext.h	2006-06-16 12:18:29.000000000 +0100
+@@ -34,7 +34,6 @@
+ 
+ #if (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)
+ #else
+-#include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ 
+ #ifdef __cplusplus


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 May 2006 17:32:58 -0000	1.9
+++ .cvsignore	16 Jun 2006 11:41:43 -0000	1.10
@@ -6,3 +6,4 @@
 hplip-0.9.8.tar.gz
 hplip-0.9.9.tar.gz
 hplip-0.9.11.tar.gz
+hplip-1.6.6.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- hplip.spec	26 May 2006 12:35:20 -0000	1.72
+++ hplip.spec	16 Jun 2006 11:41:43 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.11
-Release: 1.2
+Version: 1.6.6
+Release: 1.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -10,11 +10,11 @@
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch0: hplip-0.9.11-2.patch
 Patch1: hplip-desktop.patch
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
+Patch5: hplip-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -61,9 +61,6 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Patchlevel 2.
-%patch0 -p1 -b .0.9.11-2
-
 # Use /usr/share/applications for putting desktop files in.
 %patch1 -p1 -b .desktop
 
@@ -76,6 +73,9 @@
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
 
+# Work around missing linux/compiler.h.
+%patch5 -p1 -b .compile
+
 autoconf # for patch4
 
 %build
@@ -188,6 +188,9 @@
 fi
 
 %changelog
+* Fri Jun 16 2006 Tim Waugh <twaugh at redhat.com> 1.6.6-1.1
+- 1.6.6.
+
 * Fri May 26 2006 Tim Waugh <twaugh at redhat.com> 0.9.11-1.2
 - Patchlevel 2.
 - Include doc files (bug #192790).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 May 2006 17:32:58 -0000	1.10
+++ sources	16 Jun 2006 11:41:43 -0000	1.11
@@ -1 +1 @@
-5cf362c972d5b1733af4fb8e2ade92e4  hplip-0.9.11.tar.gz
+292fbcc25b79d273d7280760ce797666  hplip-1.6.6.tar.gz


--- hplip-0.9.11-2.patch DELETED ---