rpms/gphoto2/devel gphoto2-2.2.0-print-camera-list.patch, NONE, 1.1 gphoto2.spec, 1.67, 1.68

[fedora-cvs-commits at redhat.com]

Author: rvokal

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

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-2.2.0-print-camera-list.patch 
Log Message:
 - fix print-camera-list to not require libgphoto2 at build time

gphoto2-2.2.0-print-camera-list.patch:
 print-camera-list.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gphoto2-2.2.0-print-camera-list.patch ---
--- gphoto2-2.2.0/libgphoto2-2.2.1/packaging/generic/print-camera-list.c.old	2006-04-19 03:54:05.000000000 +0200
+++ gphoto2-2.2.0/libgphoto2-2.2.1/packaging/generic/print-camera-list.c	2006-06-22 16:11:21.000000000 +0200
@@ -48,8 +48,8 @@
 #include <time.h>
 #include <string.h>
 
-#include <gphoto2/gphoto2-camera.h>
-#include <gphoto2/gphoto2-port-log.h>
+#include "gphoto2-camera.h"
+#include "gphoto2-port-log.h"
 
 #ifndef TRUE
 #define TRUE  (0==0)


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gphoto2.spec	22 Jun 2006 13:26:37 -0000	1.67
+++ gphoto2.spec	23 Jun 2006 05:30:45 -0000	1.68
@@ -20,6 +20,7 @@
 Source5: gphoto2-config
 Patch2: gphoto2-2.2.0-gcc4.patch
 Patch5: gphoto2-2.1.99-config.patch
+Patch6: gphoto2-2.2.0-print-camera-list.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 PreReq: /sbin/ldconfig, grep, fileutils
@@ -77,6 +78,7 @@
 %setup -q -a 1 -a 2
 %patch2 -p1 -b .gcc4
 %patch5 -p1 -b .config
+%patch6 -p1 -b .include
 
 ####################################
 %build
@@ -127,8 +129,11 @@
     install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
     export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
     export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver}
+# get the correct lib
+    export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
     $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-#    ./print-camera-list hal-fdi | grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+
+
     popd
 popd
 
@@ -236,6 +241,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Fri Jun 23 2006 Radek Vokál <rvokal at redhat.com> 2.2.0-2
+- fix print-camera-list to not require libgphoto2 at build time
+
 * Thu Jun 22 2006 Radek Vokál <rvokal at redhat.com> 2.2.0-1
 - update to gphoto2-2.2.0 and libgphoto2-2.2.1