packages: ptlib/ptlib.spec - removed obsolete/nonexistant ./configure flags...

[mmazur]

Author: mmazur                       Date: Thu Feb 18 17:19:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed obsolete/nonexistant ./configure flags
- added bconds: odbc plugins video

---- Files affected:
packages/ptlib:
   ptlib.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/ptlib/ptlib.spec
diff -u packages/ptlib/ptlib.spec:1.15 packages/ptlib/ptlib.spec:1.16
--- packages/ptlib/ptlib.spec:1.15	Fri Jan 22 22:14:29 2010
+++ packages/ptlib/ptlib.spec	Thu Feb 18 18:19:14 2010
@@ -2,6 +2,11 @@
 # TODO:
 #	IPv6 support disabled ('NULL' undeclared)
 #
+# Conditional build:
+%bcond_without	odbc		# Disable ODBC support
+%bcond_without	plugins		# Disable plugins support
+%bcond_without	video		# Disable video support
+#
 Summary:	Portable Tools Library
 Summary(pl.UTF-8):	Przenośna biblioteka narzędziowa
 Name:		ptlib
@@ -12,19 +17,20 @@
 # Source0-md5:	db7fd581b66998cd76d96f8b7c3f22a1
 License:	MPLv1.0
 Group:		Libraries
-BuildRequires:	SDL-devel
+%{?with_video:BuildRequires:	SDL-devel}
+%if %{with plugins}
 BuildRequires:	alsa-lib-devel
-BuildRequires:	bison
 BuildRequires:	esound-devel
+%endif
+BuildRequires:	bison
 BuildRequires:	expat-devel
 BuildRequires:	flex
 #BuildRequires:	libavc1394-devel
 #BuildRequires:	libdc1394-devel < 2.0.0
 BuildRequires:	libstdc++-devel
-BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
-BuildRequires:	unixODBC-devel
+%{?with_odbc:BuildRequires:	unixODBC-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -150,22 +156,34 @@
 %setup -q
 
 %build
+# note: --enable-opal influences most of the remaining enable/disable defaults
 %configure \
 		--prefix=%{_prefix} \
-		--enable-alsa \
-		--enable-static \
 		--enable-opal \
+%if %{with plugins}
 		--enable-plugins \
+		--enable-alsa \
 		--enable-esd \
 		--enable-oss \
 		--enable-v4l2 \
 		--enable-v4l \
-		--enable-http \
+%else
+		--disable-plugins \
+		--disable-alsa \
+		--disable-esd \
+		--disable-oss \
+		--disable-v4l2 \
+		--disable-v4l \
+%endif
+		--%{?with_video:en}%{!?with_video:dis}able-video \
+		--%{?with_odbc:en}%{!?with_odbc:dis}able-odbc \
 		--enable-httpforms \
 		--enable-httpsvc \
 		--disable-avc \
 		--disable-dc \
 		--enable-debug
+
+
 dir=$(pwd)
 %{__make} %{?debug:debugshared}%{!?debug:optshared} \
 	PTLIBMAKEDIR="$dir/make" \
@@ -197,10 +215,12 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpt.so.*.*.*
+%if %{with plugins}
 %dir %{_libdir}/%{name}-%{version}
 %dir %{_libdir}/%{name}-%{version}/devices
 %dir %{_libdir}/%{name}-%{version}/devices/sound
 %dir %{_libdir}/%{name}-%{version}/devices/videoinput
+%endif
 
 
 %files devel
@@ -220,6 +240,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%if %{with plugins}
 %files sound-alsa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/alsa_pwplugin.so
@@ -243,6 +264,7 @@
 #%files video-avc
 #%defattr(644,root,root,755)
 #%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/avc_pwplugin.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -250,6 +272,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/02/18 17:19:14  mmazur
+- removed obsolete/nonexistant ./configure flags
+- added bconds: odbc plugins video
+
 Revision 1.15  2010/01/22 21:14:29  arekm
 - rel 8
 
@@ -257,8 +283,7 @@
 rel 7; revert provides pwlib
 
 Revision 1.13  2010/01/09 20:43:57  arekm
-- rel 6; pwlib symlink
-
+- rel 6; pwlib symlink 
 Revision 1.12  2010/01/09 20:19:45  arekm
 - rel 5; path fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ptlib/ptlib.spec?r1=1.15&r2=1.16&f=u