rpms/sane-backends/devel sane-backends-1.0.19-glibc-2.7.patch, NONE, 1.1 sane-backends.spec, 1.110, 1.111 sane-backends-1.0.18-glibc-2.7.patch, 1.2, NONE

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9117

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.19-glibc-2.7.patch 
Removed Files:
	sane-backends-1.0.18-glibc-2.7.patch 
Log Message:
update glibc-2.7 patch to apply without fuzz


sane-backends-1.0.19-glibc-2.7.patch:

--- NEW FILE sane-backends-1.0.19-glibc-2.7.patch ---
diff -up sane-backends-1.0.19/backend/mustek_pp.c.glibc-2.7 sane-backends-1.0.19/backend/mustek_pp.c
--- sane-backends-1.0.19/backend/mustek_pp.c.glibc-2.7	2005-04-10 13:53:16.000000000 +0200
+++ sane-backends-1.0.19/backend/mustek_pp.c	2008-09-03 17:15:12.000000000 +0200
@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename,
 
 	}
 	
-	if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
+	if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
 
 		DBG (1, "sane_open: could not open device (%s)\n",
 				sane_strstatus (status));
diff -up sane-backends-1.0.19/backend/pixma_common.c.glibc-2.7 sane-backends-1.0.19/backend/pixma_common.c
--- sane-backends-1.0.19/backend/pixma_common.c.glibc-2.7	2007-04-09 22:41:25.000000000 +0200
+++ sane-backends-1.0.19/backend/pixma_common.c	2008-09-03 17:20:36.000000000 +0200
@@ -500,7 +500,7 @@ pixma_open (unsigned devnr, pixma_t ** h
   strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id) - 1);
   s->ops = s->cfg->ops;
   s->scanning = 0;
-  error = s->ops->open (s);
+  error = (s->ops->open) (s);
   if (error < 0)
     goto rollback;
   *handle = s;
diff -up sane-backends-1.0.19/backend/plustek_pp.c.glibc-2.7 sane-backends-1.0.19/backend/plustek_pp.c
--- sane-backends-1.0.19/backend/plustek_pp.c.glibc-2.7	2007-11-18 11:59:18.000000000 +0100
+++ sane-backends-1.0.19/backend/plustek_pp.c	2008-09-03 17:15:12.000000000 +0200
@@ -258,7 +258,7 @@ static int drvopen(	Plustek_Device *dev 
 
     DBG( _DBG_INFO, "drvopen()\n" );
 
-	handle = dev->open((const char*)dev->name, (void *)dev );
+	handle = (dev->open)((const char*)dev->name, (void *)dev );
 
 	tsecs = 0;
 
diff -up sane-backends-1.0.19/sanei/sanei_scsi.c.glibc-2.7 sane-backends-1.0.19/sanei/sanei_scsi.c
--- sane-backends-1.0.19/sanei/sanei_scsi.c.glibc-2.7	2007-11-16 19:37:07.000000000 +0100
+++ sane-backends-1.0.19/sanei/sanei_scsi.c	2008-09-03 17:15:12.000000000 +0200
@@ -5072,7 +5072,7 @@ sanei_scsi_find_devices (const char *fin
     (*plugInInterface)->Release (plugInInterface);
     IOObjectRelease (scsiDevice);
 
-    ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface);
+    ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface);
     if (ioReturnValue != kIOReturnSuccess)
       {
 	DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue);


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sane-backends.spec	27 Mar 2008 10:23:43 -0000	1.110
+++ sane-backends.spec	3 Sep 2008 15:24:37 -0000	1.111
@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.19
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@
 Patch0: sane-backends-1.0.19-acinclude.patch.bz2
 Patch1: sane-backends-1.0.18-rpath.patch
 Patch2: sane-backends-1.0.19-pkgconfig.patch
-Patch3: sane-backends-1.0.18-glibc-2.7.patch
+Patch3: sane-backends-1.0.19-glibc-2.7.patch
 Patch4: sane-backends-1.0.19-policykit.patch
 Patch5: sane-backends-1.0.19-uninitialized.patch
 URL: http://www.sane-project.org
@@ -159,6 +159,9 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Sep 03 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-11
+- update glibc-2.7 patch to apply without fuzz
+
 * Thu Mar 27 2008 Nils Philippsen <nphilipp at redhat.com> - 1.0.19-10
 - rename 60-libsane.fdi to 19-libsane.fdi so that hal-acl-tool callouts get
   added (#438827)


--- sane-backends-1.0.18-glibc-2.7.patch DELETED ---