diff --git a/libgphoto2-2.4.6.4.tar.bz2 b/libgphoto2-2.4.6.4.tar.bz2 deleted file mode 100644 index 9538639..0000000 --- a/libgphoto2-2.4.6.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1ede907f2a955e7b4cd1b1a6496ff66f9b18be830a1b648ec43da89631e2f47 -size 5293028 diff --git a/libgphoto2-2.4.6.6.tar.bz2 b/libgphoto2-2.4.6.6.tar.bz2 new file mode 100644 index 0000000..04db399 --- /dev/null +++ b/libgphoto2-2.4.6.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:238105b81f8449902f186f2d6374668bf59e71f624d3b2165fc0301f232d48df +size 5280672 diff --git a/libgphoto2.changes b/libgphoto2.changes index 81c0c46..51df494 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 11 18:25:34 CEST 2009 - meissner@suse.de + +- 2.4.6.6 temp snapshot + - fixed udev v 136 rule generation +- 2.4.6.5 temp snapshot + - more ptp improvements +- generate UDEV 3rd generation rules (for gudev) + ------------------------------------------------------------------- Mon Jul 27 11:41:52 CEST 2009 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 43ea755..5b681a1 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.6.4) +# spec file for package libgphoto2 (Version 2.4.6.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: libgphoto2 -BuildRequires: doxygen fdupes gcc-c++ hal-devel libexif-devel libjpeg-devel libusb-devel +BuildRequires: doxygen fdupes gcc-c++ hal-devel libexif-devel libjpeg-devel libusb-devel udev Url: http://gphoto.org/ # bug437293 %ifarch ppc64 @@ -30,7 +30,7 @@ Obsoletes: libgphoto2-64bit License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.6.4 +Version: 2.4.6.6 Release: 1 Source0: libgphoto2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -179,13 +179,22 @@ pushd packaging/generic 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/ + 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." + exit 1 + 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-mtp-device @@ -212,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2_port.3* /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi +/lib/udev/rules.d/40-libgphoto2.rules # /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi %files lang -f libgphoto2-all.lang