rpms/qsf/devel qsf.spec,1.6,1.7

[Miroslav Lichvar]

Author: mlichvar

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

Modified Files:
	qsf.spec 
Log Message:
- rebuild with new gdbm
- use bcond macros



Index: qsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsf/devel/qsf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qsf.spec	27 Jul 2009 02:34:59 -0000	1.6
+++ qsf.spec	17 Mar 2010 13:05:33 -0000	1.7
@@ -1,10 +1,10 @@
-%{?!with_gdbm: %define with_gdbm 1}
-%{?!with_sqlite: %define with_sqlite 0}
-%{?!with_mysql: %define with_mysql 0}
+%bcond_without gdbm
+%bcond_with sqlite
+%bcond_with mysql
 
 Name:           qsf
 Version:        1.2.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Quick Spam Filter
 
 Group:          Applications/Internet
@@ -13,15 +13,9 @@ URL:            http://www.ivarch.com/pr
 Source0:        http://downloads.sourceforge.net/qsf/qsf-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{with_gdbm}
-BuildRequires:  gdbm-devel
-%endif
-%if %{with_sqlite}
-BuildRequires:  sqlite2-devel
-%endif
-%if %{with_mysql}
-BuildRequires:  mysql-devel
-%endif
+%{?with_gdbm:BuildRequires: gdbm-devel}
+%{?with_sqlite:BuildRequires: sqlite2-devel}
+%{?with_mysql:BuildRequires: mysql-devel}
 
 %description
 Quick Spam Filter (QSF) is an Open Source email classification filter,
@@ -41,15 +35,9 @@ QSF is designed to be run by an MDA, suc
 
 %build
 %configure \
-%if ! %{with_gdbm}
-        --without-gdbm \
-%endif
-%if ! %{with_sqlite}
-        --without-sqlite \
-%endif
-%if ! %{with_mysql}
-        --without-mysql \
-%endif
+%{!?with_gdbm:    --without-gdbm} \
+%{!?with_sqlite:  --without-sqlite} \
+%{!?with_mysql:   --without-mysql} \
 ;
 make %{?_smp_mflags}
 
@@ -70,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/qsf.1*
 
 %changelog
+* Wed Mar 17 2010 Miroslav Lichvar <mlichvar at redhat.com> 1.2.7-5
+- rebuild with new gdbm
+- use bcond macros
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild