Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at Tue May 31 13:06:02 CEST 2011.
-------- --- GNOME/libgphoto2/libgphoto2.changes 2011-04-19 15:11:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgphoto2/libgphoto2.changes 2011-05-30 17:07:29.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 30 17:06:35 CEST 2011 - [email protected] + +- disable hal support completely for 12.1 bnc#697024 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.PrUzaQ/_old 2011-05-31 13:05:20.000000000 +0200 +++ /var/tmp/diff_new_pack.PrUzaQ/_new 2011-05-31 13:05:20.000000000 +0200 @@ -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 @@ -31,7 +31,7 @@ Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.11 -Release: 1 +Release: 4 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf Patch1: libgphoto2-4096files.patch @@ -93,20 +93,6 @@ 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 @@ 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 @@ %{_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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
