From 2ae5632d35a7ae8ec7e8797057764671657a3e3fa25437fa7a7d3db346fbd3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 6 Feb 2011 16:10:18 +0000 Subject: [PATCH 1/2] Report exim-4.12-tail issue upstream and add the meta information to the header of the patch. OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=100 --- exim-4.12-tail.patch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exim-4.12-tail.patch b/exim-4.12-tail.patch index 7f95543..0299b5f 100644 --- a/exim-4.12-tail.patch +++ b/exim-4.12-tail.patch @@ -1,3 +1,8 @@ +From: Ruediger Oertel +Subject: fix deprecated tail call syntax (-1) +Reported-Upstream: Yes +Bugtracker: bugs.exim.org 1080 + Index: scripts/Configure-config.h =================================================================== --- scripts/Configure-config.h.orig From f7af4bf39392ceacd26a08b4090630b5c805b28773e94412e0c505c3af7dcc22 Mon Sep 17 00:00:00 2001 From: Peter Poeml Date: Thu, 10 Mar 2011 18:42:26 +0000 Subject: [PATCH 2/2] - postgresql-enabled build when build_with_pgsql is defined (which is done in a linked package named server:mail/exim-postgresql) OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=102 --- exim.changes | 6 ++++++ exim.spec | 23 +++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/exim.changes b/exim.changes index 3bceb5a..2886c46 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 10 18:30:11 UTC 2011 - poeml@cmdline.net + +- postgresql-enabled build when build_with_pgsql is defined (which is done in a + linked package named server:mail/exim-postgresql) + ------------------------------------------------------------------- Fri Feb 4 22:13:39 UTC 2011 - lars@samba.org diff --git a/exim.spec b/exim.spec index 33e36e8..a42527d 100644 --- a/exim.spec +++ b/exim.spec @@ -41,11 +41,15 @@ Requires: logrotate PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils %endif Version: 4.74 -Release: 3 +Release: 1 %if %{?build_with_mysql:1}0 BuildRequires: mysql-devel Provides: exim = %version %endif +%if %{?build_with_pgsql:1}0 +BuildRequires: postgresql-devel +Provides: exim = %version +%endif Summary: The Exim Mail Transfer Agent, a Replacement for sendmail BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: exim-%{version}.tar.bz2 @@ -59,7 +63,7 @@ Source30: eximstats-html-update.py Source31: eximstats.conf Patch: exim-4.12-tail.patch Patch1: aa097c4c00f62487128d74f65c521f9e877b184f.diff -%if !%{?build_with_mysql:1}0 +%if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %package -n eximon License: GPLv2+ @@ -88,7 +92,7 @@ Authors: -------- Philip Hazel -%if !%{?build_with_mysql:1}0 +%if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %description -n eximon This allows administrators to view the exim agent's mail queue and @@ -161,6 +165,9 @@ cat <<-EOF > Local/Makefile LOOKUP_LDAP=yes %if %{?build_with_mysql:1}0 LOOKUP_MYSQL=yes +%endif +%if %{?build_with_pgsql:1}0 + LOOKUP_PGSQL=yes %endif LOOKUP_NIS=yes # LOOKUP_NISPLUS=yes @@ -176,6 +183,10 @@ cat <<-EOF > Local/Makefile %if %{?build_with_mysql:1}0 LOOKUP_INCLUDE=-I /usr/include/mysql LOOKUP_LIBS=-lldap -llber -lmysqlclient +%endif +%if %{?build_with_pgsql:1}0 + LOOKUP_INCLUDE=-I /usr/include/pgsql + LOOKUP_LIBS=-lldap -llber -lpq %endif EXIM_MONITOR=eximon.bin WITH_CONTENT_SCAN=yes @@ -267,7 +278,7 @@ do done ln -sf exim $RPM_BUILD_ROOT/usr/sbin/sendmail ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim -%if !%{?build_with_mysql:1}0 +%if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/bin/ %else rm $RPM_BUILD_ROOT/usr/sbin/eximon* @@ -307,7 +318,7 @@ install -m 0755 -d $RPM_BUILD_ROOT/etc/permissions.d install -m 0644 $RPM_SOURCE_DIR/permissions.exim $RPM_BUILD_ROOT/etc/permissions.d/exim %endif # eximstats-html files -%if !%{?build_with_mysql:1}0 +%if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/ cp -p $RPM_SOURCE_DIR/eximstats.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/ @@ -386,7 +397,7 @@ exit 0 /usr/lib/sendmail /var/adm/fillup-templates/sysconfig.exim %dir %attr(750,root,mail) /var/log/exim -%if !%{?build_with_mysql:1}0 +%if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 %files -n eximon %defattr(-,root,root)