- updated to 2.5.4.1 snapshot

- more nikon 1 fix work
  - generate udev rules for /dev/sg* again

OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=116

libgphoto2-2.5.4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06af4d5d152793df4c7edf7ae7d27d45e86557fe46a05b801eccd314a08ae424
+size 6700915

libgphoto2-2.5.4.1.tar.bz2.asc

@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iD8DBQBTLyBd6nvzlwF1Yj4RApx9AJsGZ2RY5+vtaf/7Yiz4GrfStisMwgCdEGbN
+iD8DBQBTXVHc6nvzlwF1Yj4RAsl2AKCfCKSY4VBiBvfDDqGlYc8R0Id12ACeNDEp
-AwC4CbZuTrg0OpWZlpd9veo=
+Y2Tx593RHnXyzZlKYKnfnlI=
-=/51m
+=Ns+g
 -----END PGP SIGNATURE-----

libgphoto2-2.5.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5fb412e28d3a8ed15bfe86df2173360fcccd29f3d2117e8329d827c356e60bc0
-size 6682743

libgphoto2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Apr 27 18:52:40 UTC 2014 - meissner@suse.com
+
+- updated to 2.5.4.1 snapshot
+  - more nikon 1 fix work
+  - generate udev rules for /dev/sg* again
+
 -------------------------------------------------------------------
 Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com
 

libgphoto2.spec

@@ -51,10 +51,10 @@ Obsoletes:      libgphoto2-64bit
 Summary:        A Digital Camera Library
 License:        LGPL-2.1+
 Group:          Hardware/Camera
-Version:        2.5.4
+Version:        2.5.4.1
 Release:        0
-Source0:        http://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
-Source1:        http://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{name}-%{version}.tar.bz2.asc
+Source1:        %{name}-%{version}.tar.bz2.asc
 Source2:        %name.keyring
 Source3:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -141,6 +141,9 @@ pushd packaging/generic
 %if 0%{?suse_version} > 1230
 	install -m 0755 -d         $RPM_BUILD_ROOT/%{_udevhwdbdir}
 	./print-camera-list hwdb > $RPM_BUILD_ROOT/%{_udevhwdbdir}/20-gphoto.hwdb
+	# We still need UDEV rules for /dev/sg* and /dev/sd* for picture frames.
+	install -m 0755 -d                           $RPM_BUILD_ROOT%{_udevrulesdir}
+	./print-camera-list udev-rules version 201 > $RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules
 %else
 	install -m 0755 -d                           $RPM_BUILD_ROOT%{_udevrulesdir}
 	./print-camera-list udev-rules version 175 > $RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules
@@ -169,9 +172,8 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
 %{_mandir}/man3/libgphoto2_port.3*
 %if 0%{?suse_version} > 1230
 %{_udevhwdbdir}/20-gphoto.hwdb
-%else
-%{_udevrulesdir}/40-libgphoto2.rules
 %endif
+%{_udevrulesdir}/40-libgphoto2.rules
 
 %files -n libgphoto2-%{major}-lang -f libgphoto2-all.lang
 
@@ -190,9 +192,8 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
 /sbin/ldconfig
 %if 0%{?suse_version} > 1230
 %udev_hwdb_update
-%else
-udevadm control --reload 2>&1 > /dev/null || :
 %endif
+udevadm control --reload 2>&1 > /dev/null || :
 
 %postun -n %name-%major
 /sbin/ldconfig
@@ -200,9 +201,8 @@ if [ $1 -eq 0 ]; then
 %if 0%{?suse_version} > 1230
         %udev_hwdb_update
         %udev_rules_update
-%else
-        udevadm control --reload 2>&1 > /dev/null || :
 %endif
+udevadm control --reload 2>&1 > /dev/null || :
 fi
 
 %{nil}