SPECS: libgphoto2.spec - use baudboy (preferred by configure, does...

[qboosh]

Author: qboosh                       Date: Mon Dec 26 18:16:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use baudboy (preferred by configure, doesn't propagate deps unlike liblockdev)
- disable ttylock locking explicitly (tested before lockdev)

---- Files affected:
SPECS:
   libgphoto2.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/libgphoto2.spec
diff -u SPECS/libgphoto2.spec:1.34 SPECS/libgphoto2.spec:1.35
--- SPECS/libgphoto2.spec:1.34	Wed Nov  9 19:29:34 2005
+++ SPECS/libgphoto2.spec	Mon Dec 26 19:15:59 2005
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
+#
 # Conditional build:
-%bcond_without	apidocs             # without documentation which needed gtk-doc and TeX
+%bcond_without	apidocs		# without documentation which needed gtk-doc and TeX
+%bcond_without	baudboy		# use lockdev library instead of baudboy
 #
 # TODO: check resmgr linking (temporarly disabled)
 #
@@ -24,11 +26,13 @@
 BuildRequires:	libexif-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libusb-devel
-BuildRequires:	lockdev-devel >= 1.0.2
+%{?with_baudboy:BuildRequires:	lockdev-baudboy-devel}
+%{!?with_baudboy:BuildRequires:	lockdev-devel >= 1.0.2}
 BuildRequires:	pkgconfig
 Provides:	gphoto2-lib
 Obsoletes:	gphoto2-lib
 Conflicts:	gphoto2 < 2.1.1
+#%{?with_baudboy:Suggests:	lockdev-baudboy}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -54,7 +58,7 @@
 %{?with_apidocs:Requires:	gtk-doc-common}
 Requires:	libexif-devel
 Requires:	libusb-devel
-Requires:	lockdev-devel
+%{!?with_baudboy:Requires:	lockdev-devel}
 Obsoletes:	gphoto2-lib-devel
 Obsoletes:	gphoto2-devel
 
@@ -111,7 +115,9 @@
 
 %configure \
 	ac_cv_file__proc_meminfo=yes \
+	%{!?with_baudboy:--without-baudboy} \
 	--without-resmgr \
+	--without-ttylock \
 	%{?with_apidocs:--enable-docs} \
 	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}}
 
@@ -216,6 +222,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2005/12/26 18:15:59  qboosh
+- use baudboy (preferred by configure, doesn't propagate deps unlike liblockdev)
+- disable ttylock locking explicitly (tested before lockdev)
+
 Revision 1.34  2005/11/09 18:29:34  adgor
 - Renamed bcond (doc -> apidocs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libgphoto2.spec?r1=1.34&r2=1.35&f=u