rpms/postfix/F-7 postfix.spec,1.53,1.54

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13327

Modified Files:
	postfix.spec 
Log Message:
[tw]
- diabled mysql support again (rhbz#185515)
- added support flag for PostgreSQL build (rhbz#180579)
  Ben: Thanks for the patch
- Fixed remaining rewiew problems (rhbz#226307)




Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-7/postfix.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- postfix.spec	5 Jun 2007 09:55:05 -0000	1.53
+++ postfix.spec	14 Jun 2007 09:36:33 -0000	1.54
@@ -1,5 +1,6 @@
 %define LDAP 2
-%define MYSQL 1
+%define MYSQL 0
+%define PGSQL 0
 %define PCRE 1
 %define SASL 2
 %define TLS 1
@@ -24,26 +25,26 @@
 # Postfix requires one exlusive uid/gid and a 2nd exclusive gid for its own
 # use.  Let me know if the second gid collides with another package.
 # Be careful: Redhat's 'mail' user & group isn't unique!
-%define postfix_uid    89
-%define postfix_user   postfix
-%define postfix_gid    89
-%define postfix_group  postfix
-%define postdrop_group postdrop
-%define maildrop_group %{postdrop_group}
-%define maildrop_gid   %{POSTDROP_GID}
-
-%define postfix_config_dir  %{_sysconfdir}/postfix
-%define postfix_daemon_dir  %{_libexecdir}/postfix
-%define postfix_command_dir %{_sbindir}
-%define postfix_queue_dir   %{_var}/spool/postfix
-%define postfix_doc_dir     %{_docdir}/%{name}-%{version}
-%define postfix_sample_dir  %{postfix_doc_dir}/samples
-%define postfix_readme_dir  %{postfix_doc_dir}/README_FILES
+%define postfix_uid	89
+%define postfix_user	postfix
+%define postfix_gid	89
+%define postfix_group	postfix
+%define postdrop_group	postdrop
+%define maildrop_group	%{postdrop_group}
+%define maildrop_gid	%{POSTDROP_GID}
+
+%define postfix_config_dir	%{_sysconfdir}/postfix
+%define postfix_daemon_dir	%{_libexecdir}/postfix
+%define postfix_command_dir	%{_sbindir}
+%define postfix_queue_dir	%{_var}/spool/postfix
+%define postfix_doc_dir		%{_docdir}/%{name}-%{version}
+%define postfix_sample_dir	%{postfix_doc_dir}/samples
+%define postfix_readme_dir	%{postfix_doc_dir}/README_FILES
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.4.3
-Release: 1%{dist}
+Release: 2%{dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -112,6 +113,11 @@
 BuildRequires: mysql, mysql-devel
 %endif
 
+%if %{PGSQL}
+Requires: postgresql-libs
+BuildRequires: postgresql-devel
+%endif
+
 %if %{TLS}
 Requires: openssl
 BuildRequires: openssl-devel >= 0.9.6
@@ -180,6 +186,10 @@
   CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
   AUXLIBS="${AUXLIBS} -L%{_libdir}/mysql -lmysqlclient -lm"
 %endif
+%if %{PGSQL}
+  CCARGS="${CCARGS} -DHAS_PGSQL -I/usr/include/pgsql"
+  AUXLIBS="${AUXLIBS} -lpq"
+%endif
 %if %{SASL}
   %define sasl_v1_lib_dir %{_libdir}/sasl
   %define sasl_v2_lib_dir %{_libdir}/sasl2
@@ -244,8 +254,7 @@
 
 # This installs into the /etc/rc.d/init.d directory
 /bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c %{_sourcedir}/postfix-etc-init.d-postfix \
-                  $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
+install -c %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
 
 install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail.postfix
 
@@ -466,7 +475,13 @@
 
 
 %changelog
-* Tue Jun  5 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.3-1%{dist}
+* Thu Jun 14 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.3-2
+- diabled mysql support again (rhbz#185515)
+- added support flag for PostgreSQL build (rhbz#180579)
+  Ben: Thanks for the patch
+- Fixed remaining rewiew problems (rhbz#226307)
+
+* Tue Jun  5 2007 Thomas Woerner <twoerner at redhat.com> 2:2.4.3-1
 - new stable version 2.4.3
 - enabled mysql support (rhbz#185515)
 - dropped build requirements for gawk, ed and sed
@@ -833,7 +848,7 @@
 
 * Wed Feb 20 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.1.3-2
 - listen on 127.0.0.1 only by default (#60071)
-- Put config samples in %{_docdir}/%{name}-%{version} rather than
+- Put config samples in %%{_docdir}/%%{name}-%%{version} rather than
   /etc/postfix (#60072)
 - Some spec file cleanups