From b7fb5a5579ea8012b99429b04b8d69bee6b492fa Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 18 Feb 2013 07:24:54 +0100 Subject: [PATCH] use pkgconfig to find out proper path for udev rules --- libgphoto2.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index baf6dfb..7c4c259 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,3 +1,5 @@ +%global udevdir %(pkg-config --variable=udevdir udev) + Summary: Library for accessing digital cameras Name: libgphoto2 Version: 2.5.0 @@ -86,7 +88,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" #libusb and libusb have shoved their .pc files into /lib[64]/pkgconfig export PKG_CONFIG_PATH=/%{_lib}/pkgconfig %configure \ - udevscriptdir='%{_prefix}/lib/udev' \ + udevscriptdir=%{udevdir} \ --with-drivers=all \ --with-doc-dir=%{_docdir}/%{name} \ --disable-static \ @@ -115,8 +117,8 @@ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} # # Btw, since it's /lib/udev, never e.g. /lib64/udev, we hardcode the path # -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d -$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/40-libgphoto2.rules +mkdir -p $RPM_BUILD_ROOT%{udevdir}/rules.d +$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT%{udevdir}/rules.d/40-libgphoto2.rules popd # remove circular symlink in /usr/include/gphoto2 (#460807) @@ -147,8 +149,8 @@ rm -rf "${RPM_BUILD_ROOT}" %{_libdir}/libgphoto2_port/*/*.so %{_libdir}/libgphoto2/*/*.so %{_libdir}/*.so.* -%{_prefix}/lib/udev/rules.d/40-libgphoto2.rules -%{_prefix}/lib/udev/check-ptp-camera +%{udevdir}/rules.d/40-libgphoto2.rules +%{udevdir}/check-ptp-camera %post -p /sbin/ldconfig