packages: cherokee/cherokee.spec - mysql, ffmpeg and ldap bconds added

[jajcus]

Author: jajcus                       Date: Wed Apr  7 13:00:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mysql, ffmpeg and ldap bconds added

---- Files affected:
packages/cherokee:
   cherokee.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/cherokee/cherokee.spec
diff -u packages/cherokee/cherokee.spec:1.25 packages/cherokee/cherokee.spec:1.26
--- packages/cherokee/cherokee.spec:1.25	Wed Apr  7 14:31:26 2010
+++ packages/cherokee/cherokee.spec	Wed Apr  7 15:00:32 2010
@@ -1,9 +1,13 @@
 # $Revision$, $Date$
 # TODO:
-# - does it requires spawn-fcgi?
+#   - does it requires spawn-fcgi?
+#   - move modules to subpackages. At least, those with extra dependencies.
 #
 # Conditional build:
 %bcond_without	geoip		# without GeoIP support
+%bcond_without	mysql		# without MySQL support
+%bcond_without	ldap		# without LDAP support
+%bcond_without	ffmpeg		# without ffmpeg support
 #
 Summary:	Fast, Flexible and Lightweight Web server
 Summary(pl.UTF-8):	Cherokee - serwer WWW
@@ -23,10 +27,10 @@
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	ffmpeg-devel
+%{?with_ffmpeg:BuildRequires:	ffmpeg-devel}
 BuildRequires:	libtool
-BuildRequires:	mysql-devel
-BuildRequires:	openldap-devel
+%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	openssl-devel
 BuildRequires:	pam-devel
 BuildRequires:	pcre-devel
@@ -115,7 +119,10 @@
 	--with-wwwroot=%{_wwwroot} \
 	--with-wwwuser=cherokee \
 	--with-wwwgroup=http \
-	%{!?with_geoip:--without-geoip}
+	%{!?with_geoip:--without-geoip} \
+	%{!?with_mysql:--without-mysql} \
+	%{!?with_ffmpeg:--without-ffmpeg} \
+	%{!?with_ldap:--without-ldap}
 %{__make}
 
 %install
@@ -200,7 +207,7 @@
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_common.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_custom_error.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_custom.so
-%attr(755,root,root) %{_libdir}/cherokee/libplugin_dbslayer.so
+%{?with_mysql:%attr(755,root,root) %{_libdir}/cherokee/libplugin_dbslayer.so}
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_deflate.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_directory.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_dirlist.so
@@ -221,10 +228,10 @@
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_htdigest.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_htpasswd.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_ip_hash.so
-%attr(755,root,root) %{_libdir}/cherokee/libplugin_ldap.so
+%{?with_ldap:%attr(755,root,root) %{_libdir}/cherokee/libplugin_ldap.so}
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_libssl.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_method.so
-%attr(755,root,root) %{_libdir}/cherokee/libplugin_mysql.so
+%{?with_mysql:%attr(755,root,root) %{_libdir}/cherokee/libplugin_mysql.so}
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_ncsa.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_not.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_or.so
@@ -305,6 +312,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/04/07 13:00:32  jajcus
+- mysql, ffmpeg and ldap bconds added
+
 Revision 1.25  2010/04/07 12:31:26  jajcus
 - Version: 0.99.44
 - use find_lang to package localisation
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee.spec?r1=1.25&r2=1.26&f=u