Hello community,
here is the log from the commit of package libgphoto2 for openSUSE:Factory
checked in at 2012-10-18 21:53:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libgphoto2 (Old)
and /work/SRC/openSUSE:Factory/.libgphoto2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgphoto2", Maintainer is "meiss...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libgphoto2/libgphoto2.changes 2012-10-03
22:26:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libgphoto2.new/libgphoto2.changes
2012-10-18 21:53:50.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Oct 17 12:44:36 UTC 2012 - fcro...@suse.com
+
+- fix build with new udev rules location
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgphoto2.spec ++++++
--- /var/tmp/diff_new_pack.2nWHcM/_old 2012-10-18 21:53:51.000000000 +0200
+++ /var/tmp/diff_new_pack.2nWHcM/_new 2012-10-18 21:53:51.000000000 +0200
@@ -16,6 +16,12 @@
#
+%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
+%define _udevrulesdir /usr/lib/udev/rules.d
+%else
+%define _udevrulesdir /lib/udev/rules.d
+%endif
+
%define major 6
Name: libgphoto2
@@ -121,12 +127,12 @@
pushd packaging/generic
export CAMLIBS=$RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/
# new style UDEV rules (gudev) which will obsolete HAL fdi files
- if [ ! -d /lib/udev/rules.d/ ] ; then
+ if [ ! -d %{_udevrulesdir} ] ; 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 175 >
$RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
+ install -m 0755 -d
$RPM_BUILD_ROOT%{_udevrulesdir}
+ ./print-camera-list udev-rules version 175 >
$RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules
popd
# udev helpers not used here.
rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera
@@ -149,7 +155,7 @@
%{_libdir}/libgphoto2_port.so.*
%{_mandir}/man3/libgphoto2.3*
%{_mandir}/man3/libgphoto2_port.3*
-/lib/udev/rules.d/40-libgphoto2.rules
+%{_udevrulesdir}/40-libgphoto2.rules
%files -n libgphoto2-%{major}-lang -f libgphoto2-all.lang
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
