rpms/libgphoto2/devel gphoto2-pkgcfg.patch, 1.3, 1.4 libgphoto2.spec, 1.9, 1.10

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1222/devel

Modified Files:
	gphoto2-pkgcfg.patch libgphoto2.spec 
Log Message:
* Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.1-5
- fix pkgcfg patch to match actual .pc file names (fixes kdegraphics build)

(Looks like the .pc files created in libgphoto2.spec aren't actually installed, use the upstream ones instead. The real problem was that the upstream file is named libgphoto2_port.pc, not libgphoto2-port.pc.)

gphoto2-pkgcfg.patch:

Index: gphoto2-pkgcfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/gphoto2-pkgcfg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gphoto2-pkgcfg.patch	20 Jun 2008 14:55:17 -0000	1.3
+++ gphoto2-pkgcfg.patch	20 Jun 2008 16:27:59 -0000	1.4
@@ -26,12 +26,12 @@
  
      --cflags)
 -       	echo "-I at includedir@/gphoto2"
-+       	pkg-config --cflags gphoto2
++       	pkg-config --cflags libgphoto2
         	;;
  
      --libs)
 -        echo "-L at libdir@" -lgphoto2 -lgphoto2_port -lm
-+        pkg-config --libs gphoto2
++        pkg-config --libs libgphoto2
         	;;
  
      *)
@@ -63,12 +63,12 @@
  
      --cflags)
 -       	echo "-I at includedir@/gphoto2"
-+       	pkg-config --cflags gphoto2-port
++       	pkg-config --cflags libgphoto2_port
         	;;
  
      --libs)
 -       	echo "-L at libdir@" -lgphoto2_port
-+       	pkg-config --libs gphoto2-port
++       	pkg-config --libs libgphoto2_port
         	;;
  
      *)


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgphoto2.spec	20 Jun 2008 14:55:17 -0000	1.9
+++ libgphoto2.spec	20 Jun 2008 16:27:59 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -55,6 +55,7 @@
 %patch3 -p1 -b .ixany
 %patch6 -p1 -b .libusb-build
 
+# FIXME: These .pc.in files aren't actually being installed?
 cat > gphoto2.pc.in << \EOF
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -150,7 +151,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.1-4
+* Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.1-5
 - fix pkgcfg patch to match actual .pc file names (fixes kdegraphics build)
 
 * Thu Jun 12 2008 Jindrich Novy <jnovy at redhat.com> 2.4.1-3