rpms/gphoto2/devel gphoto2-pkgcfg.patch, NONE, 1.1 gphoto2.spec, 1.77, 1.78 sources, 1.16, 1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 12 09:32:04 UTC 2007
Author: jnovy
Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31724
Modified Files:
gphoto2.spec sources
Added Files:
gphoto2-pkgcfg.patch
Log Message:
- really fix the gphoto2-devel multilib conflict (#205211)
gphoto2-pkgcfg.patch:
configure | 2 +-
libgphoto2-2.3.1/gphoto2-config.in | 12 +++---------
libgphoto2-2.3.1/libgphoto2_port/gphoto2-port-config.in | 12 +++---------
3 files changed, 7 insertions(+), 19 deletions(-)
--- NEW FILE gphoto2-pkgcfg.patch ---
--- gphoto2-2.3.1/configure.pkgcfg 2006-12-24 20:36:56.000000000 +0100
+++ gphoto2-2.3.1/configure 2007-01-11 16:12:24.000000000 +0100
@@ -26323,7 +26323,7 @@
# ---------------------------------------------------------------------------
# Create output files
# ---------------------------------------------------------------------------
-ac_config_files="$ac_config_files po/Makefile.in Makefile gphoto2/Makefile m4m/Makefile doc/Makefile packaging/Makefile packaging/rpm/Makefile packaging/rpm/package.spec"
+ac_config_files="$ac_config_files gphoto2.pc gphoto2-port.pc po/Makefile.in Makefile gphoto2/Makefile m4m/Makefile doc/Makefile packaging/Makefile packaging/rpm/Makefile packaging/rpm/package.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
--- gphoto2-2.3.1/libgphoto2-2.3.1/gphoto2-config.in.pkgcfg 2006-11-25 15:47:45.000000000 +0100
+++ gphoto2-2.3.1/libgphoto2-2.3.1/gphoto2-config.in 2007-01-11 16:13:40.000000000 +0100
@@ -1,11 +1,5 @@
#! /bin/sh
-# leave these definitions here
-# they are required for correct interpolation of
-# @libdir@ and @includedir@ later on
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-
usage()
{
cat <<EOF
@@ -13,7 +7,7 @@
Known values for OPTION are:
- --prefix=DIR change libgphoto2 prefix [default ${prefix}]
+ --prefix print libgphoto2 prefix
--libs print library linking information
--cflags print pre-processor and compiler flags
--help display this help and exit
@@ -55,11 +49,11 @@
;;
--cflags)
- echo "-I at includedir@/gphoto2"
+ pkg-config --cflags gphoto2
;;
--libs)
- echo "-L at libdir@" -lgphoto2 -lgphoto2_port -lm
+ pkg-config --libs gphoto2
;;
*)
--- gphoto2-2.3.1/libgphoto2-2.3.1/libgphoto2_port/gphoto2-port-config.in.pkgcfg 2006-11-25 15:47:38.000000000 +0100
+++ gphoto2-2.3.1/libgphoto2-2.3.1/libgphoto2_port/gphoto2-port-config.in 2007-01-11 16:15:24.000000000 +0100
@@ -1,11 +1,5 @@
#! /bin/sh
-# leave these definitions here
-# they are required for correct interpolation of
-# @libdir@ and @includedir@ later on
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-
usage()
{
cat <<EOF
@@ -13,7 +7,7 @@
Known values for OPTION are:
- --prefix=DIR change libgphoto2-port prefix [default ${prefix}]
+ --prefix print libgphoto2-port prefix
--libs print library linking information
--cflags print pre-processor and compiler flags
--help display this help and exit
@@ -55,11 +49,11 @@
;;
--cflags)
- echo "-I at includedir@/gphoto2"
+ pkg-config --cflags gphoto2-port
;;
--libs)
- echo "-L at libdir@" -lgphoto2_port
+ pkg-config --libs gphoto2-port
;;
*)
Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gphoto2.spec 25 Dec 2006 09:27:13 -0000 1.77
+++ gphoto2.spec 12 Jan 2007 09:32:01 -0000 1.78
@@ -8,7 +8,7 @@
%define libpkg libgphoto2
%define libver 2.3.1
Version: %{pkgver}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,13 +16,12 @@
Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
Source3: 90-gphoto-camera-policy.fdi
Source4: gphoto-set-procperm
-Source5: gphoto2-config
+Patch1: gphoto2-pkgcfg.patch
Url: http://www.gphoto.org/
ExcludeArch: s390 s390x
Provides: libgphoto2 = %{libver}
Requires: lockdev
BuildRequires: libusb-devel >= 0.1.5
-BuildRequires: perl
BuildRequires: lockdev-devel
BuildRequires: libexif-devel
BuildRequires: libjpeg-devel, readline-devel
@@ -69,6 +68,24 @@
####################################
%prep
%setup -q -a 1
+%patch1 -p1 -b .pkgcfg
+
+# write pkg-config stuff
+cat > gphoto2.pc.in << EOF
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+VERSION=@VERSION@
+
+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
+EOF
+sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
####################################
%build
@@ -119,6 +136,7 @@
install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/
install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm
+install -m644 gphoto2.pc gphoto2-port.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
@@ -130,17 +148,6 @@
%find_lang %{libpkg}_port-0
cat libgphoto2*.lang >> %{name}.lang
-
-# multilib fun, rename old script, add dummy one
-%ifarch %{ix86}
-basearch=i386
-%else
-basearch=%{_arch}
-%endif
-
-mv ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config-${basearch}
-install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config
-
####################################
%clean
rm -rf "${RPM_BUILD_ROOT}"
@@ -197,6 +204,9 @@
# ChangeLog
########################################################################
%changelog
+* Thu Jan 11 2007 Jindrich Novy <jnovy at redhat.com> 2.3.1-2
+- really fix the gphoto2-devel multilib conflict (#205211)
+
* Mon Dec 25 2006 Jindrich Novy <jnovy at redhat.com> 2.3.1-1
- update to 2.3.1
- merry christmas!
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 25 Dec 2006 09:40:25 -0000 1.16
+++ sources 12 Jan 2007 09:32:01 -0000 1.17
@@ -1,3 +1,2 @@
-5f0bdd099f8649abf58490ffc2b5df5b gphoto2-config
00da102280dd5743d8f8b80173b4dd26 gphoto2-2.3.1.tar.bz2
37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2
More information about the fedora-cvs-commits
mailing list