diff --git a/libgphoto2.spec b/libgphoto2.spec index 1d7671d..cd4ec4a 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,7 +1,7 @@ Summary: Library for accessing digital cameras Name: libgphoto2 Version: 2.5.0 -Release: 6%{?dist} +Release: 7%{?dist} # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 License: GPLv2+ and GPLv2 Group: Development/Libraries @@ -86,7 +86,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='/lib/udev' \ + udevscriptdir='%{_libdir}/udev' \ --with-drivers=all \ --with-doc-dir=%{_docdir}/%{name} \ --disable-static \ @@ -115,8 +115,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/lib/udev/rules.d -$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules +mkdir -p $RPM_BUILD_ROOT%{_libdir}/udev/rules.d +$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT%{_libdir}/udev/rules.d/40-libgphoto2.rules popd # remove circular symlink in /usr/include/gphoto2 (#460807) @@ -147,8 +147,8 @@ rm -rf "${RPM_BUILD_ROOT}" %{_libdir}/libgphoto2_port/*/*.so %{_libdir}/libgphoto2/*/*.so %{_libdir}/*.so.* -/lib/udev/rules.d/40-libgphoto2.rules -/lib/udev/check-ptp-camera +%{_libdir}/udev/rules.d/40-libgphoto2.rules +%{_libdir}/udev/check-ptp-camera %post -p /sbin/ldconfig @@ -166,6 +166,10 @@ rm -rf "${RPM_BUILD_ROOT}" %{_mandir}/man3/* %changelog +* Wed Jan 30 2013 Jindrich Novy 2.5.0-7 +- move /lib files to /usr/lib +- fix changelog + * Fri Jan 18 2013 Adam Tkac - 2.5.0-6 - rebuild due to "jpeg8-ABI" feature drop @@ -188,7 +192,7 @@ rm -rf "${RPM_BUILD_ROOT}" * Mon Apr 16 2012 Jindrich Novy 2.4.14-1 - update to 2.4.14 -* Thu Mar 21 2012 Jindrich Novy 2.4.13-1 +* Wed Mar 21 2012 Jindrich Novy 2.4.13-1 - update to 2.4.13 * Fri Jan 13 2012 Fedora Release Engineering - 2.4.11-3 @@ -212,7 +216,7 @@ rm -rf "${RPM_BUILD_ROOT}" * Wed Oct 20 2010 Jindrich Novy 2.4.10-3 - move udev helper scripts to /lib/udev (#644552) -* Tue Sep 06 2010 Jindrich Novy 2.4.10-2 +* Mon Sep 06 2010 Jindrich Novy 2.4.10-2 - BR: gd-devel because of ax203 and st2205 camlibs (#630570) * Tue Aug 17 2010 Jindrich Novy 2.4.10-1