SPECS: qmail.spec - fix partial tls bcond usage

[glen]

Author: glen                         Date: Wed Jun 15 17:35:22 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix partial tls bcond usage

---- Files affected:
SPECS:
   qmail.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/qmail.spec
diff -u SPECS/qmail.spec:1.134 SPECS/qmail.spec:1.135
--- SPECS/qmail.spec:1.134	Tue Jun 14 11:59:30 2005
+++ SPECS/qmail.spec	Wed Jun 15 19:35:17 2005
@@ -32,7 +32,7 @@
 Summary(pl):	qmail - serwer pocztowy (MTA)
 Name:		qmail
 Version:	1.03
-Release:	57.2
+Release:	57.4
 License:	DJB (http://cr.yp.to/qmail/dist.html)
 Group:		Networking/Daemons
 Source0:	http://cr.yp.to/software/%{name}-%{version}.tar.gz
@@ -205,8 +205,11 @@
 BuildRequires:	ucspi-tcp >= 0.88
 %{?with_home_etc:BuildRequires: home-etc-devel >= 1.0.8}
 BuildRequires:	pam-devel
-%{?with_tls:BuildRequires:	openssl-devel >= 0.9.7d}
-%{?with_tls:Requires:	openssl-tools >= 0.9.7d}
+%if %{with tls}
+BuildRequires:	openssl-devel >= 0.9.7d
+Requires:	openssl-tools >= 0.9.7d
+Requires:	crondaemon
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.159
 PreReq:		rc-scripts >= 0.2.0
 PreReq:		sh-utils
@@ -220,7 +223,6 @@
 Requires(post):	fileutils
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
-Requires:	crondaemon
 Requires:	pam >= 0.77.3
 Requires:	ucspi-tcp >= 0.88
 Requires:	daemontools >= 0.76-1.4
@@ -808,12 +810,14 @@
 ln -snf %{supervise}/send /service/qmail-send
 ln -snf %{supervise}/smtpd /service/qmail-smtpd
 
+%if %{with tls}
 # session cert
 %{_sysconfdir}/cron.hourly/qmail-genrsacert.sh
 
 # server cert
 echo "Creating a self-signed ssl-certificate:"
 %{_libdir}/qmail/mkservercert || true
+%endif
 
 %triggerpostun -- %{name} <= 1.03-56.12
 if [ -f /var/lock/subsys/qmail ]; then
@@ -1228,6 +1232,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2005/06/15 17:35:17  glen
+- fix partial tls bcond usage
+
 Revision 1.134  2005/06/14 09:59:30  glen
 - amd64 fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qmail.spec?r1=1.134&r2=1.135&f=u