rpms/gphoto2/FC-4 gphoto2-gcc4.patch, 1.1, 1.2 gphoto2.spec, 1.34, 1.35 sources, 1.8, 1.9 gphoto2-hotplug.patch, 1.3, NONE gphoto2-memset.patch, 1.1, NONE gphoto2-ricoh.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: twaugh

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

Modified Files:
	gphoto2-gcc4.patch gphoto2.spec sources 
Removed Files:
	gphoto2-hotplug.patch gphoto2-memset.patch gphoto2-ricoh.patch 
Log Message:
* Wed Jul 27 2005 Tim Waugh <twaugh redhat com> 2.1.6-1.1
- Built for Fedora Core 4.


gphoto2-gcc4.patch:
 camlibs/digita/commands.c                      |    8 ++++----
 libgphoto2_port/libgphoto2_port/gphoto2-port.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: gphoto2-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-4/gphoto2-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphoto2-gcc4.patch	11 Mar 2005 17:40:45 -0000	1.1
+++ gphoto2-gcc4.patch	27 Jul 2005 17:22:14 -0000	1.2
@@ -1,16 +1,16 @@
---- gphoto2-2.1.5/libgphoto2-2.1.5/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4	2004-01-10 22:12:04.000000000 +0000
-+++ gphoto2-2.1.5/libgphoto2-2.1.5/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2005-03-11 17:09:04.000000000 +0000
+--- gphoto2-2.1.6/libgphoto2-2.1.6/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4	2005-02-22 06:33:42.000000000 +0000
++++ gphoto2-2.1.6/libgphoto2-2.1.6/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2005-06-23 12:07:51.000000000 +0100
 @@ -408,7 +408,7 @@
  
  	/* Check if we read as many bytes as expected */
- 	CHECK_SUPP (port, _("read"), port->pc->ops->read);
+ 	CHECK_SUPP (port, "read", port->pc->ops->read);
 -	retval = port->pc->ops->read (port, data, size);
 +	retval = (port->pc->ops->read) (port, data, size);
  	CHECK_RESULT (retval);
  	if (retval != size)
- 		gp_log (GP_LOG_DEBUG, "gphoto2-port", "Could only read %i "
---- gphoto2-2.1.5/libgphoto2-2.1.5/camlibs/digita/commands.c.gcc4	2005-03-11 17:15:27.000000000 +0000
-+++ gphoto2-2.1.5/libgphoto2-2.1.5/camlibs/digita/commands.c	2005-03-11 17:16:16.000000000 +0000
+ 		gp_log (GP_LOG_DEBUG, "gphoto2-port", _("Could only read %i "
+--- gphoto2-2.1.6/libgphoto2-2.1.6/camlibs/digita/commands.c.gcc4	2005-03-21 12:26:46.000000000 +0000
++++ gphoto2-2.1.6/libgphoto2-2.1.6/camlibs/digita/commands.c	2005-06-23 11:51:43.000000000 +0100
 @@ -73,7 +73,7 @@
  		return -1;
  	}


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-4/gphoto2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gphoto2.spec	1 Jun 2005 18:52:58 -0000	1.34
+++ gphoto2.spec	27 Jul 2005 17:22:14 -0000	1.35
@@ -1,21 +1,18 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.1.5
+%define pkgver 2.1.6
 %define libpkg libgphoto2
-%define libver 2.1.5
+%define libver 2.1.6
 Version: %{pkgver}
-Release: 10
+Release: 1.1
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.gz
 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.gz
 Source2: gen-libgphoto-hal-fdi
-Patch1: gphoto2-hotplug.patch
 Patch2: gphoto2-gcc4.patch
-Patch3: gphoto2-memset.patch
-Patch4: gphoto2-ricoh.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 # For /etc/hotplug/usb..
@@ -73,10 +70,7 @@
 ####################################
 %prep
 %setup -q -a 1
-%patch1 -p1 -b .hotplug
 %patch2 -p1 -b .gcc4
-%patch3 -p1 -b .memset
-%patch4 -p1 -b .ricoh
 
 ####################################
 %build
@@ -201,6 +195,12 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Wed Jul 27 2005 Tim Waugh <twaugh redhat com> 2.1.6-1.1
+- Built for Fedora Core 4.
+
+* Thu Jun 23 2005 Tim Waugh <twaugh redhat com> 2.1.6-1
+- 2.1.6.
+
 * Wed Jun  1 2005 Bill Nottingham <notting redhat com> 2.1.5-10
 - fix multilib conflict on fdi files, and their generation on x86_64
   in general


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jan 2005 14:25:53 -0000	1.8
+++ sources	27 Jul 2005 17:22:14 -0000	1.9
@@ -1,2 +1,2 @@
-210844f0d88f58842917af6eaff06382  libgphoto2-2.1.5.tar.gz
-9bd1a033389f9e4e6425dda4f6e603c9  gphoto2-2.1.5.tar.gz
+1938cbd9718595fd419907bf2f7c3195  libgphoto2-2.1.6.tar.gz
+2de2bcc62599b8a7337b54b0a067c50b  gphoto2-2.1.6.tar.gz


--- gphoto2-hotplug.patch DELETED ---


--- gphoto2-memset.patch DELETED ---


--- gphoto2-ricoh.patch DELETED ---