rpms/postfix/devel postfix.spec,1.58,1.59

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14183

Modified Files:
	postfix.spec 
Log Message:
- fixed multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
  (rhbz#342941)
- enabled mysql support




Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- postfix.spec	4 Oct 2007 13:39:00 -0000	1.58
+++ postfix.spec	7 Nov 2007 11:14:25 -0000	1.59
@@ -1,5 +1,5 @@
 %define LDAP 2
-%define MYSQL 0
+%define MYSQL 1
 %define PGSQL 0
 %define PCRE 1
 %define SASL 2
@@ -39,7 +39,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -108,8 +108,8 @@
 %endif
 
 %if %{MYSQL}
-Requires: mysql
-BuildRequires: mysql, mysql-devel
+Requires: mysql-libs
+BuildRequires: mysql-devel
 %endif
 
 %if %{PGSQL}
@@ -139,6 +139,9 @@
 %patch9 -p1 -b .cyrus
 %patch10 -p1 -b .open_define
 
+# resolve multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
+perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile.in */Makefile.in */*/Makefile.in HISTORY
+
 %if %{PFLOGSUMM}
 gzip -dc %{SOURCE53} | tar xf -
 pushd pflogsumm-%{pflogsumm_ver}
@@ -442,7 +445,7 @@
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/header_checks
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/main.cf
 %attr(0644, root, root) %{postfix_config_dir}/main.cf.default
-%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/makedefs.out
+%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/makedefs.out-*
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/master.cf
 %attr(0755, root, root) %{postfix_config_dir}/post-install
 %attr(0644, root, root) %{postfix_config_dir}/postfix-files
@@ -466,6 +469,11 @@
 
 
 %changelog
+* Wed Nov  7 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-3
+- fixed multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
+  (rhbz#342941)
+- enabled mysql support
+
 * Thu Oct  4 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.5-2
 - made init script lsb conform (#243286, rhbz#247025)
 - added link to postfix sasl readme into Postfix-SASL-RedHat readme