rpms/cups/devel cups-serial.patch,NONE,1.1 cups.spec,1.453,1.454

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29788

Modified Files:
	cups.spec 
Added Files:
	cups-serial.patch 
Log Message:
Fixed build.

cups-serial.patch:

--- NEW FILE cups-serial.patch ---
diff -up cups-1.4b2/backend/serial.c.serial cups-1.4b2/backend/serial.c
--- cups-1.4b2/backend/serial.c.serial	2008-12-16 16:25:02.000000000 +0000
+++ cups-1.4b2/backend/serial.c	2008-12-16 16:25:21.000000000 +0000
@@ -74,6 +74,7 @@
 #endif /* __APPLE__ */
 
 #if defined(__linux) && defined(TIOCGSERIAL)
+#  include <linux/types.h>
 #  include <linux/serial.h>
 #  include <linux/ioctl.h>
 #endif /* __linux && TIOCGSERIAL */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- cups.spec	16 Dec 2008 12:31:52 -0000	1.453
+++ cups.spec	16 Dec 2008 16:59:28 -0000	1.454
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.1%{?dist}
+Release: 0.%{pre}.2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2
@@ -28,6 +28,7 @@
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
 Patch4: cups-str2831.patch
+Patch5: cups-serial.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
@@ -168,6 +169,7 @@
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .str2831
+%patch5 -p1 -b .serial
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
@@ -450,7 +452,7 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Tue Dec 16 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.1
+* Tue Dec 16 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.2
 - 1.4b2.
 - No longer need CVE-2008-5183 patch.