rpms/libgphoto2/devel libgphoto2.spec,1.28,1.29

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32131

Modified Files:
	libgphoto2.spec 
Log Message:
* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 2.4.9-2
- remove the need to call autoreconf



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libgphoto2.spec	12 Apr 2010 07:26:16 -0000	1.28
+++ libgphoto2.spec	13 Jul 2010 07:09:20 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -20,8 +20,6 @@ BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig, sharutils
 BuildRequires: libtool-ltdl-devel, popt-devel
-# we run autoreconf:
-BuildRequires: autoconf, automake, libtool, gettext-devel, cvs
 Obsoletes: gphoto2 < 2.4.0-11
 Obsoletes: gphoto2-devel < 2.4.0-11
 
@@ -82,18 +80,18 @@ 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 --force
-export CFLAGS=$RPM_OPT_FLAGS
 %configure \
 	--with-drivers=all \
 	--with-doc-dir=%{_docdir}/%{name} \
 	--disable-static \
 	--disable-rpath
+
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libgphoto2_port/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libgphoto2_port/libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -164,6 +162,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 2.4.9-2
+- remove the need to call autoreconf
+
 * Mon Apr 12 2010 Jindrich Novy <jnovy at redhat.com> 2.4.9-1
 - update to 2.4.9