[libgphoto2/f18] move /lib files to /usr/lib, fix changelog
Jindrich Novy
jnovy at fedoraproject.org
Wed Jan 30 19:34:52 UTC 2013
commit cf68c58bacc4ca28cce56210b63375f363ebdc82
Author: Jindrich Novy <jnovy at redhat.com>
Date: Wed Jan 30 20:34:39 2013 +0100
move /lib files to /usr/lib, fix changelog
libgphoto2.spec | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index e2ed826..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: 5%{?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,13 @@ rm -rf "${RPM_BUILD_ROOT}"
%{_mandir}/man3/*
%changelog
+* Wed Jan 30 2013 Jindrich Novy <jnovy at redhat.com> 2.5.0-7
+- move /lib files to /usr/lib
+- fix changelog
+
+* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.5.0-6
+- rebuild due to "jpeg8-ABI" feature drop
+
* Sun Jan 13 2013 Jindrich Novy <jnovy at redhat.com> 2.5.0-5
- remove deprecated HAL file (#894527)
@@ -185,7 +192,7 @@ rm -rf "${RPM_BUILD_ROOT}"
* Mon Apr 16 2012 Jindrich Novy <jnovy at redhat.com> 2.4.14-1
- update to 2.4.14
-* Thu Mar 21 2012 Jindrich Novy <jnovy at redhat.com> 2.4.13-1
+* Wed Mar 21 2012 Jindrich Novy <jnovy at redhat.com> 2.4.13-1
- update to 2.4.13
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.11-3
@@ -209,7 +216,7 @@ rm -rf "${RPM_BUILD_ROOT}"
* Wed Oct 20 2010 Jindrich Novy <jnovy at redhat.com> 2.4.10-3
- move udev helper scripts to /lib/udev (#644552)
-* Tue Sep 06 2010 Jindrich Novy <jnovy at redhat.com> 2.4.10-2
+* Mon Sep 06 2010 Jindrich Novy <jnovy at redhat.com> 2.4.10-2
- BR: gd-devel because of ax203 and st2205 camlibs (#630570)
* Tue Aug 17 2010 Jindrich Novy <jnovy at redhat.com> 2.4.10-1
More information about the scm-commits
mailing list