Fixed build on x86_64.

Change-Id: I910f4bd16809bd883008509af9c6014922f1aa03

diff --git a/packaging/libgphoto2.spec b/packaging/libgphoto2.spec
index 989967e..e270095 100644 (file)
--- a/packaging/libgphoto2.spec
+++ b/packaging/libgphoto2.spec
@@ -50,17 +50,17 @@ This package contains the runtime code for port access.
 
 %build
 export CFLAGS+=" -fPIC"
-export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
+export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=%{_libdir}"
 %autogen
-%configure --prefix=/usr --disable-static
+%configure --disable-static
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
-rm %{buildroot}/usr/lib/udev/check-ptp-camera
-mkdir -p %{buildroot}/usr/lib/udev/rules.d
-LD_LIBRARY_PATH=%{buildroot}/usr/lib CAMLIBS=`ls -d %{buildroot}/usr/lib/libgphoto2/2*` %{buildroot}/usr/lib/libgphoto2/print-camera-list udev-rules version 136 mode 0660 group 6525 > %{buildroot}/usr/lib/udev/rules.d/40-libgphoto2.rules
+rm %{buildroot}/%{_libdir}/udev/check-ptp-camera
+mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} CAMLIBS=`ls -d %{buildroot}/%{_libdir}/libgphoto2/2*` %{buildroot}/%{_libdir}/libgphoto2/print-camera-list udev-rules version 136 mode 0660 group 6525 > %{buildroot}/%{_prefix}/lib/udev/rules.d/40-libgphoto2.rules
 
 mkdir -p %{buildroot}/usr/share/license
 cp COPYING %{buildroot}/usr/share/license/libgphoto2
@@ -78,23 +78,21 @@ cp COPYING %{buildroot}/usr/share/license/libgphoto2-devel
 %files
 %manifest libgphoto2.manifest
 %defattr(-,root,root,-)
-/usr/lib/libgphoto2/*/*.so
-/usr/lib/libgphoto2.so.*
-/usr/lib/libgphoto2/print-camera-list
-/usr/lib/udev/rules.d/40-libgphoto2.rules
+%{_libdir}/libgphoto2/*/*.so
+%{_libdir}/libgphoto2.so.*
+%{_libdir}/libgphoto2/print-camera-list
+%{_prefix}/lib/udev/rules.d/40-libgphoto2.rules
 /usr/share/license/libgphoto2
 
 %files devel
 %defattr(-,root,root,-)
-/usr/lib/libgphoto2.so
+%{_libdir}/libgphoto2.so
+%{_libdir}/libgphoto2_port.so
+%{_libdir}/pkgconfig/libgphoto2.pc
+%{_libdir}/pkgconfig/libgphoto2_port.pc
 
-/usr/lib/libgphoto2_port.so
-
-/usr/lib/pkgconfig/libgphoto2.pc
-/usr/lib/pkgconfig/libgphoto2_port.pc
-
-/usr/bin/gphoto2-config
-/usr/bin/gphoto2-port-config
+%{_bindir}/gphoto2-config
+%{_bindir}/gphoto2-port-config
 
 /usr/include/*
 
@@ -109,6 +107,6 @@ cp COPYING %{buildroot}/usr/share/license/libgphoto2-devel
 %files port
 %manifest libgphoto2-port.manifest
 %defattr(-,root,root,-)
-/usr/lib/libgphoto2_port.so.*
-/usr/lib/libgphoto2_port/*/*.so
+%{_libdir}/libgphoto2_port.so.*
+%{_libdir}/libgphoto2_port/*/*.so
 /usr/share/license/libgphoto2-port