rpms/libgphoto2/devel libgphoto2.spec, 1.3, 1.4 gphoto2-norpath.patch, 1.1, NONE
Štěpán Kasal (kasal)
fedora-extras-commits at redhat.com
Thu May 29 18:27:33 UTC 2008
Author: kasal
Update of /cvs/extras/rpms/libgphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567
Modified Files:
libgphoto2.spec
Removed Files:
gphoto2-norpath.patch
Log Message:
- drop gphoto2-norpath.patch
- use quoted here-document in %%prep
- fix some typos in m4 sources
- run autoreconf to get autotools right
Index: libgphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgphoto2.spec 23 Apr 2008 04:38:49 -0000 1.3
+++ libgphoto2.spec 29 May 2008 18:26:53 -0000 1.4
@@ -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 @@
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: 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 @@
%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 @@
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 @@
%{_mandir}/man3/*
%changelog
+* Thu May 29 2008 Stepan Kasal <skasal at 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 at redhat.com> 2.4.0-2
- apply patch to fix build with libusb
--- gphoto2-norpath.patch DELETED ---
More information about the scm-commits
mailing list