rpms/gphoto2/FC-6 gphoto2.spec,1.71,1.72 sources,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/gphoto2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv15824

Modified Files:
	gphoto2.spec sources 
Log Message:
- really fix the gphoto2-devel multilib conflict (#205211)
- gphoto2-devel requires libusb-devel (#222015)



Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-6/gphoto2.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gphoto2.spec	2 Jan 2007 16:41:23 -0000	1.71
+++ gphoto2.spec	18 Jan 2007 16:42:21 -0000	1.72
@@ -16,7 +16,7 @@
 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}
@@ -47,7 +47,7 @@
 Summary: Headers and links to compile against the libgphoto2 library.
 Requires: %{name} = %{version}
 Requires: pkgconfig
-Requires: libexif-devel
+Requires: libexif-devel, libusb-devel
 Group: Development/Libraries
 
 ####################################
@@ -68,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
@@ -118,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,16 +149,6 @@
 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}"
@@ -196,6 +205,10 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Thu Jan 18 2007 Jindrich Novy <jnovy at redhat.com> 2.3.1-2
+- really fix the gphoto2-devel multilib conflict (#205211)
+- gphoto2-devel requires libusb-devel (#222015)
+
 * Tue Jan  2 2007 Jindrich Novy <jnovy at redhat.com> 2.3.1-1
 - update to 2.3.1
 - don't ship docs in separate tarball, use the internal one


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	2 Jan 2007 16:41:23 -0000	1.14
+++ sources	18 Jan 2007 16:42:21 -0000	1.15
@@ -1,3 +1,2 @@
-5f0bdd099f8649abf58490ffc2b5df5b  gphoto2-config
 00da102280dd5743d8f8b80173b4dd26  gphoto2-2.3.1.tar.bz2
 37f85e34e5b6031ddf6cac8b8782ac4f  libgphoto2-2.3.1.tar.bz2