rpms/hplip/FC-4 hplip-compile.patch, NONE, 1.1 hplip.spec, 1.21, 1.22 hplip-condrestart.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-compile.patch 
Removed Files:
	hplip-condrestart.patch 
Log Message:
- Fix compile errors.

hplip-compile.patch:
 mfpdtf.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-compile.patch ---
--- hplip-0.9.5/scan/sane/mfpdtf.h.compile	2005-09-19 12:13:21.000000000 +0100
+++ hplip-0.9.5/scan/sane/mfpdtf.h	2005-09-19 12:13:46.000000000 +0100
@@ -351,7 +351,7 @@
 #define htole16(A) ((((uint16_t)(A) & 0xff00) >> 8) | (((uint16_t)(A) & 0x00ff) << 8))    /* host to little-endian 16-bit value */
 #define letoh16 h2le16                         /* little-endian to host 16-bit value */
 #define htole32(A) ((((uint32_t)(A) & (uint32_t)0x000000ff) << 24) | (((uint32_t)(A) & (uint32_t)0x0000ff00) << 8) | \
-                  (((uint32_t)(A) & (uint32_t)0x00ff0000) >> 8) | (((uint32_t)(A) & (uint32_t)0xff000000) >> 24))))
+                  (((uint32_t)(A) & (uint32_t)0x00ff0000) >> 8) | (((uint32_t)(A) & (uint32_t)0xff000000) >> 24))
 #define letoh32 htole32
 #else
 #define htole16(A) (A)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-4/hplip.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hplip.spec	19 Sep 2005 10:50:31 -0000	1.21
+++ hplip.spec	19 Sep 2005 11:17:14 -0000	1.22
@@ -8,8 +8,9 @@
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch1: hplip-desktop.patch
-Patch2: hplip-config.patch
+Patch1: hplip-compile.patch
+Patch2: hplip-desktop.patch
+Patch3: hplip-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -51,11 +52,14 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Fix compile errors.
+%patch1 -p1 -b .compile
+
 # Use /usr/share/applications for putting desktop files in.
-%patch1 -p1 -b .desktop
+%patch2 -p1 -b .desktop
 
 # Use static IP ports (for SELinux policy).
-%patch2 -p1 -b .config
+%patch3 -p1 -b .config
 
 %build
 %configure
@@ -139,6 +143,7 @@
 %changelog
 * Mon Sep 19 2005 Tim Waugh <twaugh at redhat.com> 0.9.5-1
 - Build for Fedora Core 4.
+- Fix compile errors.
 - 0.9.5.
 - No longer need condrestart patch.
 


--- hplip-condrestart.patch DELETED ---