[libgphoto2/f18] recompile with -fno-strict-aliasing, drop deprecated HAL file (#894527)

Jindrich Novy jnovy at fedoraproject.org
Wed Jan 30 19:07:04 UTC 2013


commit fa5793a302d0b21c1cdb5efd65f76eb9b8843b46
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Wed Jan 30 20:06:50 2013 +0100

    recompile with -fno-strict-aliasing, drop deprecated HAL file (#894527)

 libgphoto2.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index a8dfdc3..e2ed826 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.5.0
-Release: 3%{?dist}
+Release: 5%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -82,6 +82,7 @@ EOF
 sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
 
 %build
+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 \
@@ -105,12 +106,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
 
 pushd packaging/linux-hotplug/
-install -d -m755 %{buildroot}/usr/share/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 | \
-grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 
 # Output udev rules for device identification; this is used by GVfs gphoto2
 # backend and others.
@@ -149,7 +147,6 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_libdir}/libgphoto2_port/*/*.so
 %{_libdir}/libgphoto2/*/*.so
 %{_libdir}/*.so.*
-%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 /lib/udev/rules.d/40-libgphoto2.rules
 /lib/udev/check-ptp-camera
 
@@ -169,6 +166,12 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 13 2013 Jindrich Novy <jnovy at redhat.com> 2.5.0-5
+- remove deprecated HAL file (#894527)
+
+* Sat Dec 01 2012 Jindrich Novy <jnovy at redhat.com> 2.5.0-4
+- compile with -fno-strict-aliasing (because of ptp.c)
+
 * Wed Sep 19 2012 Hans de Goede <hdegoede at redhat.com> 2.5.0-3
 - Fix the usbscsi port driver not working, this fixes many miniature
   (keychain) photo frames no longer being accessible


More information about the scm-commits mailing list