rpms/gphoto2/devel gphoto2-ixany.patch, NONE, 1.1 gphoto2.spec, 1.87, 1.88

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14009

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-ixany.patch 
Log Message:
* Mon Feb 25 2008 Jindrich Novy <jnovy at redhat.com> 2.4.0-6
- fix gphoto2 build on alpha arch (#416941)
- manual rebuild because of gcc-4.3 (#434187)


gphoto2-ixany.patch:

--- NEW FILE gphoto2-ixany.patch ---
diff -up gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c.ixany gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c
--- gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c.ixany	2007-07-27 02:36:13.000000000 +0200
+++ gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c	2008-02-25 06:40:40.000000000 +0100
@@ -98,6 +98,10 @@
 
 #define CHECK(result) {int r=(result); if (r<0) return (r);}
 
+#ifndef IXANY
+#define IXANY	0004000
+#endif
+
 /* Linux */
 #ifdef __linux__
 /* devfs is accounted for in the implementation */


Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gphoto2.spec	19 Feb 2008 06:47:48 -0000	1.87
+++ gphoto2.spec	25 Feb 2008 05:51:10 -0000	1.88
@@ -8,7 +8,7 @@
 %define libpkg libgphoto2
 %define libver 2.4.0
 Version: %{pkgver}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,7 @@
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
 Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
+Patch3: gphoto2-ixany.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 Provides: libgphoto2 = %{libver}
@@ -70,6 +71,7 @@
 %setup -q -a 1
 %patch1 -p1 -b .pkgcfg
 %patch2 -p1 -b .storage
+%patch3 -p1 -b .ixany
 
 # write pkg-config stuff 
 cat > gphoto2.pc.in << EOF
@@ -199,6 +201,10 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Mon Feb 25 2008 Jindrich Novy <jnovy at redhat.com> 2.4.0-6
+- fix gphoto2 build on alpha arch (#416941)
+- manual rebuild because of gcc-4.3 (#434187)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4.0-5
 - Autorebuild for GCC 4.3