- use db by default (4.1.25 required!), bcond for db3

- removed RPM_OPT_FLAGS from sendmail-config.m4 (broke --debug)

Changed files:
    sendmail-config.m4 -> 1.5
    sendmail.spec -> 1.114

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

diff --git a/sendmail.spec b/sendmail.spec
index b368ed3fb2afc9e0e6ca81456e6f26c3c20391c6..d0d0d5861557c5655ec1a09e0669cbcee1f462d5 100644 (file)
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -2,8 +2,9 @@
 # Conditional build:
 # _without_ldap                without LDAP support
 # _without_tls         without TLS (SSL) support
+# _with_db3            use db3 instead of db package
 # _with_pgsql          without pgsql support (bluelabs)
-
+#
 Summary:       A widely used Mail Transport Agent (MTA)
 Summary(de):   sendmail-Mail-Übertragungsagent
 Summary(es):   Sendmail - agente de transporte de mail
@@ -42,12 +43,11 @@ Patch5:             %{name}-redirect.patch
 Patch6:                %{name}-hprescan-dos.patch
 Patch7:                http://blue-labs.org/clue/bluelabs.patch-8.12.3
 BuildRequires: cyrus-sasl-devel
-BuildRequires: db3-devel
+%{?_with_db3:BuildRequires:    db3-devel}
+%{!?_with_db3:BuildRequires:   db-devel >= 4.1.25}
 %{!?_without_ldap:BuildRequires:       openldap-devel}
 %{!?_without_tls:BuildRequires:        openssl-devel}
 %{?_with_pgsql:BuildRequires: postgresql-devel}
-Requires:      m4
-Requires:      procmail
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
@@ -57,6 +57,9 @@ Requires(post):       textutils
 Requires(post,preun):/sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
+%{!?_with_db3:Requires:        db >= 4.1.25}
+Requires:      m4
+Requires:      procmail
 Provides:      smtpdaemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     smtpdaemon