rpms/dbmail/devel dbmail.spec,1.25,1.26

[Bernard Johnson]

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18691

Modified Files:
	dbmail.spec 
Log Message:
- build agaist old gmime22 (bz #490316)



Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/devel/dbmail.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dbmail.spec	24 Feb 2009 10:59:10 -0000	1.25
+++ dbmail.spec	20 Mar 2009 03:23:54 -0000	1.26
@@ -4,14 +4,9 @@
 
 %define         services dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved
 
-# older distros don't have sqlite
-%if 0%{?fedora} && 0%{?fedora} < 4
-%define without_sqlite 1
-%endif
-
 Name:           dbmail
 Version:        2.2.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons
@@ -30,23 +25,19 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fileutils, openssl-devel >= 0.9.7a
-BuildRequires:  glib2-devel >= 2.8,  gmime-devel >= 2.1.19
+BuildRequires:  glib2-devel >= 2.8,  gmime22-devel >= 2.1.19
 BuildRequires:  libsieve-devel >= 2.1.13
 BuildRequires:  mysql-devel >= 4.1.3, postgresql-devel
 BuildRequires:  openldap-devel
-%if ! 0%{?without_sqlite}
 BuildRequires:  sqlite-devel >= 3
-%endif
 
 Requires:       glib2 >= 2.8, logrotate, initscripts, vixie-cron
 Requires:       initscripts
 Requires:       /usr/sbin/sendmail
 Requires(pre):  fedora-usermgmt
 Requires(postun):fedora-usermgmt
-%if ! 0%{?without_sqlite}
 Requires:       sqlite >= 3
 Obsoletes:      dbmail-sqlite < 2.2.5
-%endif
 
 
 %description
@@ -56,9 +47,7 @@
 Currently dbmail supports the following database backends:
 MySQL
 PostgreSQL
-%if ! 0%{?without_sqlite}
 SQLite
-%endif
 
 Please see /usr/share/doc/dbmail-*/README.fedora for specific information on
 installation and configuration in Fedora.
@@ -75,9 +64,7 @@
 # make a couple of changes to the default dbmail.conf file:
 # 1. default driver/authdriver sqlite/sql (sqlite, if supported)
 # 2. effective uid/gid to dbmail/dbmail
-%if ! 0%{?without_sqlite}
 sed -i 's/\(^driver\W*=\)\(\W*$\)/\1 sqlite/' dbmail.conf
-%endif
 sed -i -e 's,\(^db\W*=\)\(.*$\),\1 %{_localstatedir}/lib/dbmail/dbmail.db,'   \
        -e 's/\(^authdriver\W*=\)\(\W*$\)/\1 sql/'                             \
        -e 's/\(^EFFECTIVE_USER\W*=\)\(.*$\)/\1 dbmail/'                       \
@@ -106,9 +93,7 @@
            --with-ldap \
            --with-mysql \
            --with-pgsql \
-%if ! 0%{?without_sqlite}
            --with-sqlite \
-%endif
            --with-sieve
 
 make %{?_smp_mflags}
@@ -185,11 +170,9 @@
 %{_initrddir}/dbmail-*
 %{_sysconfdir}/cron.daily/dbmail
 %config(noreplace) %{_sysconfdir}/logrotate.d/dbmail
-%if ! 0%{?without_sqlite}
 %doc sql/sqlite/*
 %{_libdir}/dbmail/libsqlite*
 %dir %attr(0775,root,dbmail) /var/lib/dbmail
-%endif
 
 %package auth-ldap
 Summary:        A database backed mail storage system - ldap authentication plugin
@@ -231,6 +214,9 @@
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Thu Mar 19 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-4
+- build agaist old gmime22 (bz #490316)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild