From 62651f07347ed3aa21b1567ee6cc39e5a17ae2e00fd13317383ae8ce6cc816db Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 30 May 2011 15:07:29 +0000 Subject: [PATCH] - disable hal support completely for 12.1 bnc#697024 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=44 --- libgphoto2.changes | 5 +++++ libgphoto2.spec | 20 +------------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index a7c3233..b653ace 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 30 17:06:35 CEST 2011 - meissner@suse.de + +- disable hal support completely for 12.1 bnc#697024 + ------------------------------------------------------------------- Tue Apr 19 15:09:27 CEST 2011 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 6e31906..b69b931 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -19,7 +19,7 @@ Name: libgphoto2 -BuildRequires: doxygen fdupes gcc-c++ gd-devel hal libexif-devel libjpeg-devel libusb-devel lockdev-devel pkg-config udev +BuildRequires: doxygen fdupes gcc-c++ gd-devel libexif-devel libjpeg-devel libusb-devel lockdev-devel pkg-config udev Url: http://gphoto.org/ # bug437293 %ifarch ppc64 @@ -93,20 +93,6 @@ export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} cat libgphoto2-2.lang libgphoto2_port-0.lang > libgphoto2-all.lang pushd packaging/generic export CAMLIBS=$RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/ - # Check the installed hal (in neededforbuild) if the directory - # is still at the place we expect to avoid surprises. - if [ ! -d /usr/share/hal/fdi/information/20thirdparty/ ] ; then - echo "*** The hal FDI file location has changed. Fix the build." - exit 1 - fi - install -m 0755 -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/ - ./print-camera-list hal-fdi > $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi - # ./print-camera-list hal-fdi-dev > $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi - if [ ! -s $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi ]; then - echo "*** Did not generate a fdi map. Check the build." - exit 1 - fi -%if 0%{?suse_version} >= 1120 # new style UDEV rules (gudev) which will obsolete HAL fdi files if [ ! -d /lib/udev/rules.d/ ] ; then echo "*** The udev rules file location has changed. Fix the build." @@ -114,7 +100,6 @@ pushd packaging/generic fi install -m 0755 -d $RPM_BUILD_ROOT/lib/udev/rules.d/ ./print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules -%endif popd # udev helpers not used here. rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera @@ -143,10 +128,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgphoto2_port.so.* %{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2_port.3* -/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi -%if 0%{?suse_version} >= 1120 /lib/udev/rules.d/40-libgphoto2.rules -%endif # /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi %files lang -f libgphoto2-all.lang