- bcond_off_ldap

- don't use -s on %%{debug}

Changed files:
    sendmail-config.m4 -> 1.4
    sendmail.spec -> 1.44

diff --git a/sendmail-config.m4 b/sendmail-config.m4
index c7699a16c431bca8dcff5421f33967a790f2f01c..4f0672ce05fc02e337ac652cb737be51de9912de 100644 (file)
--- a/sendmail-config.m4
+++ b/sendmail-config.m4
@@ -1,7 +1,6 @@
 define(`confMAPDEF', `-DNEWDB -DNIS')
 define(`confENVDEF', `$(RPM_OPT_FLAGS) -DXDEBUG=0')
 define(`confLIBS', `-lnsl')
 define(`confMAPDEF', `-DNEWDB -DNIS')
 define(`confENVDEF', `$(RPM_OPT_FLAGS) -DXDEBUG=0')
 define(`confLIBS', `-lnsl')

-define(`confLDOPTS', `-s')

 define(`confMANOWN', `root')
 define(`confMANGRP', `root')
 define(`confMANMODE', `644')
 define(`confMANOWN', `root')
 define(`confMANGRP', `root')
 define(`confMANMODE', `644')


@@ -10,5 +9,3 @@ define(`confMAN5SRC', `5')
 define(`confMAN8SRC', `8')
 APPENDDEF(`confENVDEF', -DSASL)
 APPENDDEF(`conf_sendmail_LIBS', -lsasl)
 define(`confMAN8SRC', `8')
 APPENDDEF(`confENVDEF', -DSASL)
 APPENDDEF(`conf_sendmail_LIBS', -lsasl)

-APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-APPENDDEF(`confLIBS', `-lldap -llber')

diff --git a/sendmail.spec b/sendmail.spec
index 2c38318bc9cfc32148adfb6bfa61ec730f83022b..6f210cfdf77508707a9a5721b069d1f75d885914 100644 (file)
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+# bcond_off_ldap - without LDAP
+#

 Summary:       A widely used Mail Transport Agent (MTA)
 Summary(de):   sendmail-Mail-Übertragungsagent
 Summary(fr):   Agent de transport de courrier sendmail
 Summary:       A widely used Mail Transport Agent (MTA)
 Summary(de):   sendmail-Mail-Übertragungsagent
 Summary(fr):   Agent de transport de courrier sendmail


@@ -37,7 +41,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db3-devel
 BuildRequires: gdbm-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db3-devel
 BuildRequires: gdbm-devel

-BuildRequires: openldap-devel
+%{!?bcond_off_ldap:BuildRequires:      openldap-devel}

 BuildRequires: pam-devel
 Requires:      m4
 Prereq:                /sbin/chkconfig
 BuildRequires: pam-devel
 Requires:      m4
 Prereq:                /sbin/chkconfig


@@ -113,6 +117,14 @@ install %{SOURCE7} config.m4
 
 %build
 
 
 %build
 

+%if %{?debug:0}%{!?debug:1}
+echo "define(\`confLDOPTS\', \`-s\')" >> config.m4
+%endif
+%if %{?bcond_off_ldap:0}%{!?bcond_off_ldap:1}
+echo "APPENDDEF(\`confMAPDEF\', \`-DLDAPMAP\')" >> config.m4
+echo "APPENDDEF(\`confLIBS\', \`-lldap -llber\')" >> config.m4
+%endif
+

 RPM_OPT_FLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} \
        -DUSE_VENDOR_CF_PATH=1 -DNETINET6 -D_FFR_TESTMODE_DROP_PRIVS"
 export RPM_OPT_FLAGS
 RPM_OPT_FLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} \
        -DUSE_VENDOR_CF_PATH=1 -DNETINET6 -D_FFR_TESTMODE_DROP_PRIVS"
 export RPM_OPT_FLAGS