Browse Source

postfix:
- update to 2.11.1
- build with libpq-devel and libmysqlclient-devel (vl7)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8555 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 10 years ago
parent
commit
d1cd12964b
1 changed files with 17 additions and 3 deletions
  1. 17 3
      p/postfix/postfix-vl.spec

+ 17 - 3
p/postfix/postfix-vl.spec

@@ -27,7 +27,7 @@
 %define postfix_readme_dir      %{postfix_doc_dir}/README_FILES
 
 
-%define origversion 2.10.3
+%define origversion 2.11.1
 
 # Macro: %{dynmap_add_cmd <name> [-m]}
 %define dynmap_add_cmd(m) FILE=%{_sysconfdir}/postfix/dynamicmaps.cf; if ! grep -q "^%{1}[[:space:]]" ${FILE}; then echo "Adding %{1} map entry to ${FILE}"; printf '%%-8s%%-35s%%-18s%%s\\n' %{1} %{_libdir}/postfix/dict_%{1}.so dict_%{1}_open %{-m:mkmap_%{1}_open} >> ${FILE}; fi;
@@ -51,7 +51,7 @@ Patch0:    postfix-2.9.1-vine.patch
 
 # patches 100-199 are imported from debian package.
 # patches 100/101 for postfix 2.8.x are from mdk.
-Patch100: postfix-2.9.1-dynamicmaps.diff
+Patch100: postfix-2.11.1-dynamicmaps.diff
 Patch101: postfix-2.9.1-dynamicmaps2.diff
 
 # patches 200-299 are imported from rh/fedora
@@ -64,12 +64,23 @@ BuildRequires: db4-devel >= 4.6.21, pam-devel, gdbm-devel
 BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: openldap-devel, openssl-devel
 BuildRequires: pcre-devel
+
 %if %build_mysql
+%if "%{_dist_release}" >= "vl7"
+BuildRequires: libmysqlclient-devel
+%else
 BuildRequires: MySQL-devel
 %endif
+%endif
+
 %if %build_pgsql
+%if "%{_dist_release}" >= "vl7"
+BuildRequires: libpq-devel
+%else
 BuildRequires: postgresql-devel
 %endif
+%endif
+
 BuildRequires: sqlite3-devel
 
 Requires:    cyrus-sasl >= 2, cyrus-sasl-md5, cyrus-sasl-plain 
@@ -122,7 +133,6 @@ SQLite map on Postfix.
 Summary: PGSQL map support for Postfix
 Group:     System Environment/Daemons
 Requires(pre): postfix = %{version}-%{release}
-Requires: postgresql-libs, postgresql
 %description pgsql
 This package contains shared lib module which support
 PostgreSQL map on Postfix.
@@ -504,6 +514,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postfix/dict_pcre.so
 
 %changelog
+* Sun Jun 15 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.11.1-1
+- update to 2.11.1
+- build with libpq-devel and libmysqlclient-devel (vl7)
+
 * Sat Jan 18 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.3-1
 - new upstream release.