rpm/libgphoto2
SHA256
1
0
Fork 0
forked from pool/libgphoto2
Code Pull Requests Activity

Accepting request 138505 from graphics

Browse Source 
- fix build with new udev rules location (forwarded request 138502 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/138505
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=77
This commit is contained in:
Stephan Kulow 2012-10-18 19:53:49 +00:00 committed by Git OBS Bridge
commit 4c7b7fd91a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgphoto2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 17 12:44:36 UTC 2012 - fcrozat@suse.com
- fix build with new udev rules location
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 3 16:23:37 UTC 2012 - coolo@suse.com Wed Oct 3 16:23:37 UTC 2012 - coolo@suse.com

14
libgphoto2.spec
View File

@ -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 %define major 6
Name: libgphoto2 Name: libgphoto2
@ -121,12 +127,12 @@ cat libgphoto2-%{major}.lang libgphoto2_port-10.lang > libgphoto2-all.lang
pushd packaging/generic pushd packaging/generic
export CAMLIBS=$RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/ export CAMLIBS=$RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/
# new style UDEV rules (gudev) which will obsolete HAL fdi files # 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." echo "*** The udev rules file location has changed. Fix the build."
exit 1 exit 1
fi fi
install -m 0755 -d $RPM_BUILD_ROOT/lib/udev/rules.d/ install -m 0755 -d $RPM_BUILD_ROOT%{_udevrulesdir}
./print-camera-list udev-rules version 175 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules ./print-camera-list udev-rules version 175 > $RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules
popd popd
# udev helpers not used here. # udev helpers not used here.
rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera
@ -149,7 +155,7 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete
%{_libdir}/libgphoto2_port.so.* %{_libdir}/libgphoto2_port.so.*
%{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2.3*
%{_mandir}/man3/libgphoto2_port.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 %files -n libgphoto2-%{major}-lang -f libgphoto2-all.lang