[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gphoto2/devel gphoto2-2.2.0-gcc4.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 gphoto2-2.1.99-config.patch, 1.1, 1.2 gphoto2.spec, 1.66, 1.67 sources, 1.12, 1.13 gphoto2-2.1.99-canon_segv.patch, 1.1, NONE gphoto2-2.1.99-dbus.patch, 1.1, NONE gphoto2-2.1.99-gtk_doc.patch, 1.3, NONE gphoto2-2.1.99-library-null.patch, 1.1, NONE gphoto2-2.1.99-new-usbids.patch, 1.1, NONE gphoto2-gcc4.patch, 1.3, NONE



Author: rvokal

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

Modified Files:
	.cvsignore gphoto2-2.1.99-config.patch gphoto2.spec sources 
Added Files:
	gphoto2-2.2.0-gcc4.patch 
Removed Files:
	gphoto2-2.1.99-canon_segv.patch gphoto2-2.1.99-dbus.patch 
	gphoto2-2.1.99-gtk_doc.patch gphoto2-2.1.99-library-null.patch 
	gphoto2-2.1.99-new-usbids.patch gphoto2-gcc4.patch 
Log Message:
- update to gphoto2-2.2.0 and libgphoto2-2.2.1

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

--- NEW FILE gphoto2-2.2.0-gcc4.patch ---
--- gphoto2-2.1.99/libgphoto2-2.2.1/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4	2005-02-22 06:33:42.000000000 +0000
+++ gphoto2-2.1.99/libgphoto2-2.2.1/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);
-	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.99/libgphoto2-2.2.1/camlibs/digita/commands.c.gcc4	2005-03-21 12:26:46.000000000 +0000
+++ gphoto2-2.1.99/libgphoto2-2.2.1/camlibs/digita/commands.c	2005-06-23 11:51:43.000000000 +0100
@@ -73,7 +73,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, (unsigned char *)&ss, sizeof(ss));
+	ret = (dev->read)(dev, (unsigned char *)&ss, sizeof(ss));
 	if (ret < 0) {
 		GP_DEBUG("digita_get_storage_status: error getting count (ret = %d)", ret);
 		return -1;
@@ -117,7 +117,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, (void *)buffer, buflen);
+	ret = (dev->read)(dev, (void *)buffer, buflen);
 	if (ret < 0) {
 		GP_DEBUG("digita_get_file_list: error receiving data (ret = %d)", ret);
 		return -1;
@@ -169,7 +169,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, gfdr, GFD_BUFSIZE + sizeof(*gfdr));
+	ret = (dev->read)(dev, gfdr, GFD_BUFSIZE + sizeof(*gfdr));
 	if (ret < 0) {
 		GP_DEBUG("digita_get_file_data: error reading data (ret = %d)", ret);
 		return -1;
@@ -205,7 +205,7 @@
 		return -1;
 	}
 
-	ret = dev->read(dev, (unsigned char *)&response, sizeof(response));
+	ret = (dev->read)(dev, (unsigned char *)&response, sizeof(response));
 	if (ret < 0) {
 		GP_DEBUG("error reading reply (ret = %d)", ret);
 		return -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 May 2006 14:32:38 -0000	1.12
+++ .cvsignore	22 Jun 2006 13:26:36 -0000	1.13
@@ -8,3 +8,5 @@
 gphoto2-2.1.99.tar.bz2
 gphoto2-2.1.99-installed-doc.tar.bz2
 gphoto2-config
+libgphoto2-2.2.1.tar.bz2
+gphoto2-2.2.0.tar.bz2

gphoto2-2.1.99-config.patch:
 gphoto2-config.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gphoto2-2.1.99-config.patch
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2-2.1.99-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphoto2-2.1.99-config.patch	14 Mar 2006 11:06:41 -0000	1.1
+++ gphoto2-2.1.99-config.patch	22 Jun 2006 13:26:37 -0000	1.2
@@ -1,5 +1,5 @@
---- gphoto2-2.1.99/libgphoto2-2.1.99/gphoto2-config.in.orig	2006-03-14 11:59:01.000000000 +0100
-+++ gphoto2-2.1.99/libgphoto2-2.1.99/gphoto2-config.in	2006-03-14 11:59:41.000000000 +0100
+--- gphoto2-2.1.99/libgphoto2-2.2.1/gphoto2-config.in.orig	2006-03-14 11:59:01.000000000 +0100
++++ gphoto2-2.1.99/libgphoto2-2.2.1/gphoto2-config.in	2006-03-14 11:59:41.000000000 +0100
 @@ -59,7 +59,7 @@
         	;;
  


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gphoto2.spec	7 Jun 2006 18:24:30 -0000	1.66
+++ gphoto2.spec	22 Jun 2006 13:26:37 -0000	1.67
@@ -4,11 +4,11 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.1.99
+%define pkgver 2.2.0
 %define libpkg libgphoto2
-%define libver 2.1.99
+%define libver 2.2.1
 Version: %{pkgver}
-Release: 14
+Release: 1
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -18,13 +18,8 @@
 Source3: 90-gphoto-camera-policy.fdi
 Source4: gphoto-set-procperm
 Source5: gphoto2-config
-Patch2: gphoto2-gcc4.patch
-Patch3: gphoto2-2.1.99-dbus.patch
-Patch4: gphoto2-2.1.99-canon_segv.patch
+Patch2: gphoto2-2.2.0-gcc4.patch
 Patch5: gphoto2-2.1.99-config.patch
-Patch6: gphoto2-2.1.99-library-null.patch
-Patch7: gphoto2-2.1.99-gtk_doc.patch
-Patch8: gphoto2-2.1.99-new-usbids.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -81,12 +76,7 @@
 %prep
 %setup -q -a 1 -a 2
 %patch2 -p1 -b .gcc4
-%patch3 -p1 -b .dbus
-%patch4 -p1 -b .segv
 %patch5 -p1 -b .config
-%patch6 -p1 -b .null
-%patch7 -p1
-%patch8 -p1 -b .camlibs
 
 ####################################
 %build
@@ -137,7 +127,8 @@
     install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
     export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
     export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver}
-    ./print-usb-usermap --fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+    $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+#    ./print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
     popd
 popd
 
@@ -162,8 +153,18 @@
 rm -rf %{buildroot}%{_libdir}/*.a
 rm -rf %{buildroot}%{_libdir}/*.la
 
-eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
-eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
+# gphoto2-2.1.99
+#eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
+#eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
+
+# ghoto2-2.2.0
+#LIBGPHOTO2_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_CURRENT\],' %{libpkg}-%{libver}/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
+#LIBGPHOTO2_PORT_CURRENT=`grep 'AC_SUBST(\[LIBGPHOTO2_PORT_CURRENT\],' %{libpkg}-%{libver}/libgphoto2_port/configure.in | sed 's/^.*[[]\([^]]*\)[]])$/\1/'`
+
+# the above doesn't get correct numbers -> hardcode them
+LIBGPHOTO2_CURRENT=2
+LIBGPHOTO2_PORT_CURRENT=0
+
 %find_lang %{name}
 %find_lang %{libpkg}-$LIBGPHOTO2_CURRENT
 %find_lang %{libpkg}_port-$LIBGPHOTO2_PORT_CURRENT
@@ -235,6 +236,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Thu Jun 22 2006 Radek Vokál <rvokal redhat com> 2.2.0-1
+- update to gphoto2-2.2.0 and libgphoto2-2.2.1
+
 * Wed Jun  7 2006 Radek Vokál <rvokal redhat com> 2.1.99-14
 - fix policy file (#189936)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 May 2006 14:32:39 -0000	1.12
+++ sources	22 Jun 2006 13:26:37 -0000	1.13
@@ -1,4 +1,4 @@
-3c6d9cb65661915e07491a6f9215d5a9  libgphoto2-2.1.99.tar.bz2
-549a9dfae6910ab6456b194ea86b55a2  gphoto2-2.1.99.tar.bz2
 584e1fca2dd1e6cd210d59f7944c8ebd  gphoto2-2.1.99-installed-doc.tar.bz2
 5f0bdd099f8649abf58490ffc2b5df5b  gphoto2-config
+69827311733e39fafa9f77bb05e55b77  libgphoto2-2.2.1.tar.bz2
+f5c1f83185db598b4ca52889964a5e84  gphoto2-2.2.0.tar.bz2


--- gphoto2-2.1.99-canon_segv.patch DELETED ---


--- gphoto2-2.1.99-dbus.patch DELETED ---


--- gphoto2-2.1.99-gtk_doc.patch DELETED ---


--- gphoto2-2.1.99-library-null.patch DELETED ---


--- gphoto2-2.1.99-new-usbids.patch DELETED ---


--- gphoto2-gcc4.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]