rpms/dbmail/EL-5 dbmail.spec,1.5,1.6

[Bernard Johnson (bjohnson)]

Author: bjohnson

Update of /cvs/extras/rpms/dbmail/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10740/EL-5

Modified Files:
	dbmail.spec 
Log Message:
change conditionals to only exclude sqlite when built in fedora build system
and only when fedora < 4
actually apply patch for short writes



Index: dbmail.spec
===================================================================
RCS file: /cvs/extras/rpms/dbmail/EL-5/dbmail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbmail.spec	22 Mar 2007 16:07:22 -0000	1.5
+++ dbmail.spec	23 Mar 2007 00:19:26 -0000	1.6
@@ -6,13 +6,13 @@
 %define         services dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved
 
 # older distros don't have sqlite
-%if "%fedora" >= "4" || "%rhel" >= "4"
-%define with_sqlite 1
+%if 0%{?fedora} && "%fedora" < "4"
+%define without_sqlite 1
 %endif
 
 Name:           dbmail
 Version:        2.2.4
-Release:        3%{?dist}%{?repotag:.%{repotag}}
+Release:        4%{?dist}%{?repotag:.%{repotag}}
 Summary:        The DBMail mail storage system
 
 Group:          System Environment/Daemons
@@ -36,7 +36,7 @@
 BuildRequires:  libsieve-devel >= 2.1.13
 BuildRequires:  mysql-devel >= 4.1.3, postgresql-devel
 BuildRequires:  openldap-devel
-%if 0%{?with_sqlite}
+%if ! 0%{?without_sqlite}
 BuildRequires:  sqlite-devel >= 3
 %endif
 
@@ -53,7 +53,7 @@
 Currently dbmail supports the following database backends:
 MySQL
 PostgreSQL
-%if 0%{?with_sqlite}
+%if ! 0%{?without_sqlite}
 SQLite
 %endif
 
@@ -64,6 +64,7 @@
 %setup -q
 %patch0 -p1 -b .kill-module-path
 %patch1 -p0 -b .expunge
+%patch2 -p0 -b .shortwrite
 
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
@@ -77,7 +78,7 @@
            --with-ldap \
            --with-mysql \
            --with-pgsql \
-%if 0%{?with_sqlite}
+%if ! 0%{?without_sqlite}
            --with-sqlite \
 %endif
            --with-sieve
@@ -203,7 +204,7 @@
 %doc sql/postgresql/*
 %{_libdir}/dbmail/libpgsql*
 
-%if 0%{?with_sqlite}
+%if ! 0%{?without_sqlite}
 %package sqlite
 Summary:        The DBMail mail storage system
 Group:          System Environment/Daemons
@@ -220,11 +221,16 @@
 %endif
 
 %changelog
+* Thu Mar 23 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-4
+- actually APPLY the short write patch
+
 * Thu Mar 22 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-3
 - patch to eliminate short write messages
 - use /sbin/service instead of running init scripts directly
 - requires for initscripts because daemon function in initfile requires it
 - modern tarballs do not require xmlto and asciidoc to build the docs
+- change conditionals to give everything sqlite support unless it's built in
+  the fedora buildsystem and %%{fedora} < 4
 
 * Tue Mar 20 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-2
 - patch to fix expunge bug