- drop gphoto2-norpath.patch

- use quoted here-document in %%prep
- fix some typos in m4 sources
- run autoreconf to get autotools right

gphoto2-norpath.patch

@@ -1,28 +0,0 @@
-diff -up libgphoto2-2.4.0/libgphoto2_port/configure.norpath libgphoto2-2.4.0/libgphoto2_port/configure
---- libgphoto2-2.4.0/libgphoto2_port/configure.norpath	2007-07-28 17:02:04.000000000 +0200
-+++ libgphoto2-2.4.0/libgphoto2_port/configure	2008-03-13 09:55:36.000000000 +0100
-@@ -8149,8 +8149,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-     # Set some defaults for GNU ld with shared library support. These
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    runpath_var=
-+    hardcode_libdir_flag_spec=
-     export_dynamic_flag_spec='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-diff -up libgphoto2-2.4.0/configure.norpath libgphoto2-2.4.0/configure
---- libgphoto2-2.4.0/configure.norpath	2007-07-28 17:02:11.000000000 +0200
-+++ libgphoto2-2.4.0/configure	2008-03-13 09:51:54.000000000 +0100
-@@ -8579,8 +8579,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-     # Set some defaults for GNU ld with shared library support. These
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    runpath_var=
-+    hardcode_libdir_flag_spec=
-     export_dynamic_flag_spec='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then

libgphoto2.spec

@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -10,7 +10,6 @@ Source0: http://downloads.sourceforge.net/gphoto/libgphoto2-%{version}.tar.bz2
 Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
-Patch4: gphoto2-norpath.patch
 Patch5: gphoto2-data-phase.patch
 Patch6: gphoto2-libusb-fix-build.patch
 Url: http://www.gphoto.org/
@@ -19,8 +18,10 @@ BuildRequires: libusb-devel >= 0.1.5
 BuildRequires: lockdev-devel
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libtool, pkgconfig, sharutils
+BuildRequires: pkgconfig, sharutils
 BuildRequires: libtool-ltdl-devel, popt-devel
+# we run autoreconf:
+BuildRequires: autoconf, automake, libtool, gettext-devel
 
 %description
 libgphoto2 is a library that can be used by applications to access
@@ -48,11 +49,10 @@ use libgphoto2.
 %patch1 -p1 -b .pkgcfg
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
-%patch4 -p1 -b .norpath
 %patch5 -p1 -b .data-phase
 %patch6 -p1 -b .libusb-build
 
-cat > gphoto2.pc.in << EOF
+cat > gphoto2.pc.in << \EOF
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
@@ -63,12 +63,18 @@ Name: gphoto2
 Description: Library for easy access to digital cameras
 Requires:
 Version: @VERSION@
-Libs: -L\${libdir} -lgphoto2 -lgphoto2_port -lm
-Cflags: -I\${includedir} -I\${includedir}/gphoto2
+Libs: -L${libdir} -lgphoto2 -lgphoto2_port -lm
+Cflags: -I${includedir} -I${includedir}/gphoto2
 EOF
 sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
 
 %build
+# Patch6 changes configure.ac, so we run autoreconf.
+# This also installs our patched libtool.m4, avoiding the rpath problem.
+# But fix a typo first:
+sed -i 's/\(AC_SUBST([^,]*\)}/\1/' {m4m,libgphoto2_port/m4}/gp-documentation.m4
+sed -i 's/\(m4_pattern_\)disallow/\1forbid/g' {m4m,libgphoto2_port/m4}/gp-check-library.m4
+autoreconf -i
 export CFLAGS=$RPM_OPT_FLAGS
 %configure \
 	--with-drivers=all \
@@ -141,6 +147,12 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Thu May 29 2008 Stepan Kasal <skasal@redhat.com> 2.4.0-3
+- drop gphoto2-norpath.patch
+- use quoted here-document in %%prep
+- fix some typos in m4 sources
+- run autoreconf to get autotools right
+
 * Mon Apr 21 2008 Jindrich Novy <jnovy@redhat.com> 2.4.0-2
 - apply patch to fix build with libusb