Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at 2013-10-02 13:31:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgphoto2 (Old) and /work/SRC/openSUSE:Factory/.libgphoto2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgphoto2" Changes: -------- --- /work/SRC/openSUSE:Factory/libgphoto2/libgphoto2.changes 2013-08-19 23:43:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgphoto2.new/libgphoto2.changes 2013-10-02 13:31:04.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 30 12:22:48 UTC 2013 - [email protected] + +- Replace udev rules with udev hwdb for openSUSE 13.1 or later + (more efficient). +- Fix udev hwdb installation and ensure udev hwdb is updated when + package is installed / updated / uninstalled. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.ZA17lO/_old 2013-10-02 13:31:04.000000000 +0200 +++ /var/tmp/diff_new_pack.ZA17lO/_new 2013-10-02 13:31:04.000000000 +0200 @@ -38,6 +38,9 @@ BuildRequires: lockdev-devel BuildRequires: pkg-config BuildRequires: udev +%if 0%{?suse_version} > 1230 +BuildRequires: systemd-rpm-macros +%endif Url: http://gphoto.org/ # bug437293 %ifarch ppc64 @@ -141,12 +144,13 @@ echo "*** The udev rules file location has changed. Fix the build." exit 1 fi +%if 0%{?suse_version} > 1230 + install -m 0755 -d $RPM_BUILD_ROOT/%{_udevhwdbdir} + ./print-camera-list hwdb > $RPM_BUILD_ROOT/%{_udevhwdbdir}/20-gphoto.hwdb +%else install -m 0755 -d $RPM_BUILD_ROOT%{_udevrulesdir} ./print-camera-list udev-rules version 175 > $RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules - if [ -d /usr/lib/udev/hwdb.d ] ; then - install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/udev/hwdb.d/ - ./print-camera-list hwdb > $RPM_BUILD_ROOT/usr/lib/udev/hwdb.d/20-gphoto.conf. - fi +%endif popd # udev helpers not used here. rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera @@ -169,8 +173,11 @@ %{_libdir}/libgphoto2_port.so.* %{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2_port.3* +%if 0%{?suse_version} > 1230 +%{_udevhwdbdir}/20-gphoto.hwdb +%else %{_udevrulesdir}/40-libgphoto2.rules -/usr/lib/udev/hwdb.d/20-gphoto.conf. +%endif %files -n libgphoto2-%{major}-lang -f libgphoto2-all.lang @@ -185,8 +192,25 @@ %{_libdir}/pkgconfig/libgphoto2.pc %{_libdir}/pkgconfig/libgphoto2_port.pc -%post -n %name-%major -p /sbin/ldconfig +%post -n %name-%major +/sbin/ldconfig +%if 0%{?suse_version} > 1230 +%udev_hwdb_update +%else +udevadm control --reload 2>&1 > /dev/null || : +%endif + +%postun -n %name-%major +/sbin/ldconfig +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 +fi -%postun -n %name-%major -p /sbin/ldconfig +%{nil} %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
