OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=16

conf.diff

@@ -0,0 +1,33 @@
+--- configure.ac
++++ configure.ac
+@@ -197,7 +197,8 @@ dnl We are using our own libltdl checks
+ dnl because we do not want to ship our own copy of libltdl any more.
+ dnl Not shipping libltdl makes it possible to ditch our own autogen.sh
+ dnl and relying on standard autoconf's "autoreconf".
+-GP_LIB_LTDL
++dnl GP_LIB_LTDL
++AC_WITH_LTDL
+ 
+ 
+ # report on compiler/libtool setup
+--- libgphoto2_port/configure.ac
++++ libgphoto2_port/configure.ac
+@@ -78,7 +78,8 @@ dnl We are using our own libltdl checks
+ dnl because we do not want to ship our own copy of libltdl any more.
+ dnl Not shipping libltdl makes it possible to ditch our own autogen.sh
+ dnl and relying on standard autoconf's "autoreconf".
+-GP_LIB_LTDL
++dnl GP_LIB_LTDL
++AC_WITH_LTDL
+ 
+ 
+ # report on compiler/libtool setup
+@@ -337,7 +338,7 @@ dnl libusb
+ dnl ---------------------------------------------------------------------------
+ GP_CONFIG_MSG([USB ports])
+ GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5],
+-		[usb.h],[usb_busses],[
++		[usb.h],[usb_open],[
+ 	IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb"
+ ],[],
+ 		[disable-explicitly],

libgphoto2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 11 21:25:28 CET 2008 - schwab@suse.de
+
+- Fix configure script.
+
 -------------------------------------------------------------------
 Tue Mar  4 08:32:00 CET 2008 - meissner@suse.de
 

libgphoto2.spec

@@ -19,9 +19,10 @@ License:        LGPL v2.1 or later
 Group:          Hardware/Camera
 Summary:        A Digital Camera Library
 Version:        2.4.0
-Release:        83
+Release:        85
 Source0:        libgphoto2-%{version}.tar.bz2
 Patch0:         hal.diff
+Patch1:         conf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package devel
@@ -141,9 +142,11 @@ Authors:
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}}
+AUTOPOINT=true autoreconf -fi
 PATH="/usr/X11R6/bin:$PATH"			\
 %configure					\
   --with-doc-dir=%{_defaultdocdir}/%{name}	\
@@ -225,6 +228,8 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Tue Mar 11 2008 schwab@suse.de
+- Fix configure script.
 * Tue Mar 04 2008 meissner@suse.de
 - use info.subsystem in our FDI files.
 * Fri Feb 29 2008 meissner@suse.de