SPECS: proftpd.spec - proper bconds support

[zbyniu]

Author: zbyniu                       Date: Wed Jun  7 11:32:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- proper bconds support

---- Files affected:
SPECS:
   proftpd.spec (1.225 -> 1.226) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.225 SPECS/proftpd.spec:1.226
--- SPECS/proftpd.spec:1.225	Sat Jun  3 23:58:19 2006
+++ SPECS/proftpd.spec	Wed Jun  7 13:32:29 2006
@@ -47,12 +47,18 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libwrap-devel
-%{?with_quotamysql:BuildRequires:	mysql-devel}
+%if %{with mysql} || %{with quotamysql}
+BuildRequires:	mysql-devel
+%endif
 BuildRequires:	ncurses-devel
-%{?with_quotaldap:BuildRequires:	openldap-devel}
+%if %{with ldap} || %{with quotaldap}
+BuildRequires:	openldap-devel
+%endif
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_pam:BuildRequires:		pam-devel}
-%{?with_quotapgsql:BuildRequires:	postgresql-devel}
+%if %{with pgsql} || %{with quotapgsql}
+BuildRequires:	postgresql-devel
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -476,16 +482,18 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_auth_pam.conf
-echo 'LoadModule        mod_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ldap.conf
+%{?with_ldap:echo 'LoadModule        mod_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ldap.conf}
 echo 'LoadModule        mod_quotatab.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab.conf
 echo 'LoadModule        mod_quotatab_file.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_file.conf
-echo 'LoadModule        mod_quotatab_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_ldap.conf
-echo 'LoadModule        mod_quotatab_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_sql.conf
+%{?with_quotaldap:echo 'LoadModule        mod_quotatab_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_ldap.conf}
 echo 'LoadModule        mod_ratio.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ratio.conf
 echo 'LoadModule        mod_readme.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_readme.conf
+%if %{with mysql} || %{with pgsql}
+echo 'LoadModule        mod_quotatab_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_sql.conf
 echo 'LoadModule        mod_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql.conf
-echo 'LoadModule        mod_sql_mysql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_mysql.conf
-echo 'LoadModule        mod_sql_postgres.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_postgres.conf
+%endif
+%{?with_mysql:echo 'LoadModule        mod_sql_mysql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_mysql.conf}
+%{?with_pgsql:echo 'LoadModule        mod_sql_postgres.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_postgres.conf}
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
 echo 'LoadModule        mod_wrap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_wrap.conf
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/anonftp.conf
@@ -674,6 +682,7 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/anonftp.conf
 
+%if %{with pam}
 %files mod_auth_pam
 %defattr(644,root,root,755)
 %doc README.PAM
@@ -681,32 +690,41 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.ftp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_auth_pam.conf
 %attr(755,root,root) %{_libexecdir}/mod_auth_pam.so
+%endif
 
+%if %{with ldap}
 %files mod_ldap
 %defattr(644,root,root,755)
 %doc README.LDAP
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ldap.conf
 %attr(755,root,root) %{_libexecdir}/mod_ldap.so
+%endif
 
 %files mod_quotatab
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab.conf
 %attr(755,root,root) %{_libexecdir}/mod_quotatab.so
 
+%if %{with quotafile}
 %files mod_quotatab_file
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab_file.conf
 %attr(755,root,root) %{_libexecdir}/mod_quotatab_file.so
+%endif
 
+%if %{with quotaldap}
 %files mod_quotatab_ldap
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab_ldap.conf
 %attr(755,root,root) %{_libexecdir}/mod_quotatab_ldap.so
+%endif
 
+%if %{with quotamysql} || %{with quotapgsql}
 %files mod_quotatab_sql
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab_sql.conf
 %attr(755,root,root) %{_libexecdir}/mod_quotatab_sql.so
+%endif
 
 %files mod_ratio
 %defattr(644,root,root,755)
@@ -718,20 +736,26 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_readme.conf
 %attr(755,root,root) %{_libexecdir}/mod_readme.so
 
+%if %{with mysql} || %{with pgsql}
 %files mod_sql
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql.conf
 %attr(755,root,root) %{_libexecdir}/mod_sql.so
+%endif
 
+%if %{with mysql}
 %files mod_sql_mysql
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql_mysql.conf
 %attr(755,root,root) %{_libexecdir}/mod_sql_mysql.so
+%endif
 
+%if %{with pgsql}
 %files mod_sql_postgres
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql_postgres.conf
 %attr(755,root,root) %{_libexecdir}/mod_sql_postgres.so
+%endif
 
 %files mod_tls
 %defattr(644,root,root,755)
@@ -749,6 +773,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.226  2006/06/07 11:32:29  zbyniu
+- proper bconds support
+
 Revision 1.225  2006/06/03 21:58:19  glen
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.225&r2=1.226&f=u