SPECS: libgphoto2.spec - simplified: use print-camera-list in buil...

[qboosh]

Author: qboosh                       Date: Sat Aug 25 20:55:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified: use print-camera-list in builddir

---- Files affected:
SPECS:
   libgphoto2.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/libgphoto2.spec
diff -u SPECS/libgphoto2.spec:1.73 SPECS/libgphoto2.spec:1.74
--- SPECS/libgphoto2.spec:1.73	Sat Aug 25 22:32:31 2007
+++ SPECS/libgphoto2.spec	Sat Aug 25 22:55:36 2007
@@ -176,7 +176,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -237,18 +236,16 @@
 	docs
 
 # hal
-export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 cd packaging/linux-hotplug
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty
-export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 
-$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list hal-fdi | \
+../generic/print-camera-list hal-fdi | \
 	grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 
-$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list \
-	udev-rules version 0.98 group usb mode 0660 > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/52-udev-gphoto.rules
+../generic/print-camera-list udev-rules version 0.98 group usb mode 0660 \
+	> $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/52-udev-gphoto.rules
 
 %if %{with static_libs}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgphoto2/*/*.a
@@ -341,6 +338,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2007/08/25 20:55:36  qboosh
+- simplified: use print-camera-list in builddir
+
 Revision 1.73  2007/08/25 20:32:31  qboosh
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgphoto2.spec?r1=1.73&r2=1.74&f=u