packages: libgphoto2/libgphoto2.spec - rel 2 - drop HAL, use UDEV only

[baggins]

Author: baggins                      Date: Thu Jul 21 11:32:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- drop HAL, use UDEV only

---- Files affected:
packages/libgphoto2:
   libgphoto2.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: packages/libgphoto2/libgphoto2.spec
diff -u packages/libgphoto2/libgphoto2.spec:1.109 packages/libgphoto2/libgphoto2.spec:1.110
--- packages/libgphoto2/libgphoto2.spec:1.109	Wed Apr 20 20:21:16 2011
+++ packages/libgphoto2/libgphoto2.spec	Thu Jul 21 13:32:52 2011
@@ -4,6 +4,7 @@
 %bcond_with	apidocs		# API documentation (currently broken)
 %bcond_without	baudboy		# use lockdev library instead of baudboy
 %bcond_with	canonupload	# Canon upload experimental code
+%bcond_with	hal		# build HAL support
 %bcond_without	static_libs	# static libraries
 #
 Summary:	Libraries for digital cameras
@@ -12,7 +13,7 @@
 Summary(pt_BR.UTF-8):	GNU Photo - programa GNU para câmeras digitais
 Name:		libgphoto2
 Version:	2.4.11
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
@@ -29,7 +30,7 @@
 BuildRequires:	gd-devel
 BuildRequires:	gettext-devel >= 0.14.1
 %{?with_apidocs:BuildRequires:	gtk-doc >= 0.10}
-BuildRequires:	hal-devel >= 0.5.0
+%{?with_hal:BuildRequires:	hal-devel >= 0.5.0}
 BuildRequires:	libexif-devel >= 1:0.6.13
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel
@@ -277,11 +278,13 @@
 ../generic/print-camera-list udev-rules version 136 group usb mode 0660 \
 	> $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
 
+%if %{with hal}
 # hal
 install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty
 
 ../generic/print-camera-list hal-fdi | \
 	grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+%endif
 
 %if %{with static_libs}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libgphoto2/*/*.a
@@ -372,9 +375,11 @@
 /lib/udev/rules.d/40-libgphoto2.rules
 %attr(755,root,root) /lib/udev/check-ptp-camera
 
+%if %{with hal}
 %files -n hal-libgphoto2
 %defattr(644,root,root,755)
 %{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -382,6 +387,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2011/07/21 11:32:52  baggins
+- rel 2
+- drop HAL, use UDEV only
+
 Revision 1.109  2011/04/20 18:21:16  qboosh
 - updated to 2.4.11
 - added pl.po-update patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgphoto2/libgphoto2.spec?r1=1.109&r2=1.110&f=u