2010-04-20 Brian Cameron <[email protected]>
authoryippi
Tue, 20 Apr 2010 20:31:44 +0000
changeset 17886 7d3334e70d52
parent 17885 89c68f7e6b08
child 17887 e07bd365d9a3
2010-04-20 Brian Cameron <[email protected]> * base-specs/libgphoto2.spec, patches/libgphoto2-04-scsi-usb.diff: Update to 2.4.9.1 and remove unneeded hunk from patch. Add patch comment to spec file.
base-specs/libgphoto2.spec
patches/libgphoto2-04-scsi-usb.diff
--- a/base-specs/libgphoto2.spec	Tue Apr 20 19:53:20 2010 +0000
+++ b/base-specs/libgphoto2.spec	Tue Apr 20 20:31:44 2010 +0000
@@ -14,7 +14,7 @@
 Name:         libgphoto2
 License:      LGPLv2.1
 Group:        Library/Hardware/Other
-Version:      2.4.9
+Version:      2.4.9.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sourceforge
@@ -28,6 +28,7 @@
 Patch2:       libgphoto2-02-man.diff
 # date:2009-10-27 type:feature owner:funix
 Patch3:       libgphoto2-03-gettext.diff
+# date:2009-10-27 type:bug owner:yippi bugid:2990079
 Patch4:       libgphoto2-04-scsi-usb.diff
 URL:          http://www.gphoto.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -146,7 +147,7 @@
 
 %changelog -n libgphoto2
 * Tue Apr 20 2010 - [email protected]
-- Bump to 2.4.9.
+- Bump to 2.4.9.1.
 * Mon Jan 25 2010 - [email protected]
 - Bump to 2.4.8.
 * Wed Oct 28 2009 - [email protected]
--- a/patches/libgphoto2-04-scsi-usb.diff	Tue Apr 20 19:53:20 2010 +0000
+++ b/patches/libgphoto2-04-scsi-usb.diff	Tue Apr 20 20:31:44 2010 +0000
@@ -18,29 +18,3 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <sys/param.h>
---- libgphoto2-2.4.9/libgphoto2_port/configure.ac-orig	2010-04-20 11:12:05.460272323 -0500
-+++ libgphoto2-2.4.9/libgphoto2_port/configure.ac	2010-04-20 11:33:14.304568030 -0500
-@@ -354,7 +354,7 @@ AC_CHECK_LIB(pthread, pthread_create)
- GP_CONFIG_MSG([USB ports])
- GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5],
- 		[usb.h],[usb_open],[
--	IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb usbdiskdirect usbscsi"
-+	IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb usbdiskdirect"
- ],[],
- 		[disable-explicitly],
- 		[http://libusb.sourceforge.net/]
-@@ -363,6 +363,14 @@ GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0
- dnl depends on libusb's availability
- GP_UDEV([test "x$have_LIBUSB" = xyes])
- 
-+if test "x$have_LIBUSB" = "xyes"; then
-+	AC_CHECK_HEADER([scsi/sg.h],
-+			[have_sg=yes])
-+	if test "x$have_sg" = "xyes"; then
-+		IOLIB_SUBDIRS="$IOLIB_SUBDIRS usbscsi"
-+	fi
-+fi
-+
- dnl ---------------------------------------------------------------------------
- dnl disk - hal and various stuff
- dnl ---------------------------------------------------------------------------