- simplified: use print-camera-list in builddir

Changed files:
    libgphoto2.spec -> 1.74

diff --git a/libgphoto2.spec b/libgphoto2.spec
index fe225d61575d71ca4435520b0ab7b132a9066b9b..04c5b50419f4b5f228f9e1ed6bc83dd8e5996e5a 100644 (file)
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -176,7 +176,6 @@ CFLAGS="%{rpmcflags}%{?with_canonupload: -DCANON_EXPERIMENTAL_UPLOAD}"
 
 %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 @@ cp --parents \
        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