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

Accepting request 72190 from graphics

Browse Source 
hal sectomy

OBS-URL: https://build.opensuse.org/request/show/72190
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=60
This commit is contained in:
Sascha Peilicke 2011-05-31 11:05:56 +00:00 committed by Git OBS Bridge
commit d448332091
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgphoto2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 30 17:06:35 CEST 2011 - meissner@suse.de
- disable hal support completely for 12.1 bnc#697024
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 19 15:09:27 CEST 2011 - meissner@suse.de Tue Apr 19 15:09:27 CEST 2011 - meissner@suse.de

20
libgphoto2.spec
View File

@ -19,7 +19,7 @@
Name: libgphoto2 Name: libgphoto2
BuildRequires: doxygen fdupes gcc-c++ gd-devel hal libexif-devel libjpeg-devel libusb-devel lockdev-devel pkg-config udev BuildRequires: doxygen fdupes gcc-c++ gd-devel libexif-devel libjpeg-devel libusb-devel lockdev-devel pkg-config udev
Url: http://gphoto.org/ Url: http://gphoto.org/
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -93,20 +93,6 @@ export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
cat libgphoto2-2.lang libgphoto2_port-0.lang > libgphoto2-all.lang cat libgphoto2-2.lang libgphoto2_port-0.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/
# Check the installed hal (in neededforbuild) if the directory
# is still at the place we expect to avoid surprises.
if [ ! -d /usr/share/hal/fdi/information/20thirdparty/ ] ; then
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/
./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 # new style UDEV rules (gudev) which will obsolete HAL fdi files
if [ ! -d /lib/udev/rules.d/ ] ; then if [ ! -d /lib/udev/rules.d/ ] ; then
echo "*** The udev rules file location has changed. Fix the build." echo "*** The udev rules file location has changed. Fix the build."
@ -114,7 +100,6 @@ pushd packaging/generic
fi fi
install -m 0755 -d $RPM_BUILD_ROOT/lib/udev/rules.d/ 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 ./print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
%endif
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
@ -143,10 +128,7 @@ rm -rf $RPM_BUILD_ROOT
%{_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*
/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
%if 0%{?suse_version} >= 1120
/lib/udev/rules.d/40-libgphoto2.rules /lib/udev/rules.d/40-libgphoto2.rules
%endif
# /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi # /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi
%files lang -f libgphoto2-all.lang %files lang -f libgphoto2-all.lang