From 176d0d3ec0b85e20d914f09060e87f3b463032062f22210c0f6651b4dc21c3a0 Mon Sep 17 00:00:00 2001
From: Peter Poeml <poeml@cmdline.net>
Date: Fri, 11 Jul 2008 09:58:23 +0000
Subject: [PATCH] sync internal buildsystem's spec file mods

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=74
---
 exim.spec | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/exim.spec b/exim.spec
index fbfd8d9..bb9a587 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package exim (Version 4.67)
+# spec file for package exim (Version 4.69)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           exim
 BuildRequires:  db-devel openldap2-devel pcre-devel
 %if %{?suse_version:1}%{?!suse_version:0}
@@ -26,12 +27,12 @@ BuildRequires:  libXaw-devel libXext-devel libXt-devel openssl-devel tcp_wrapper
 BuildRequires:  mysql-devel
 Provides:       exim = %{version}-%{release}
 %endif
-URL:            http://www.exim.org/
+Url:            http://www.exim.org/
 Conflicts:      sendmail sendmail-tls postfix
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          Productivity/Networking/Email/Servers
-Autoreqprov:    on
-provides:     smtp_daemon
+AutoReqProv:    on
+Provides:       smtp_daemon
 %if %{?suse_version:%suse_version}%{?!suse_version:0} > 800
 Requires:       logrotate
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd fileutils textutils
@@ -53,9 +54,11 @@ Patch:          exim-4.12-tail.patch
 Patch1:         exim-4.69-overflow.patch
 Patch2:         exim-4.60-external-pcre.diff
 %if !%{?build_with_mysql:1}0
+
 %package -n eximon
 Summary:        Eximon, an graphical frontend to administer Exim's mail queue
 Group:          Productivity/Networking/Email/Servers
+
 %package -n eximstats-html
 Summary:        Create HTML reports of exim logs
 Group:          Productivity/Networking/Email/Servers
@@ -91,7 +94,6 @@ Authors:
 --------
     Philip Hazel <ph10@cus.cam.ac.uk>
 
-
 %description -n eximstats-html
 If this package is installed alongside the exim MTA, and you enable
 EXIM_REPORT_WEEKLY_HTML in /etc/sysconfig/exim, logrotate/cron will
@@ -111,9 +113,11 @@ Authors:
     Philip Hazel <ph10@cus.cam.ac.uk>
 
 %endif
+
 %prep
 %setup -q -n exim-%{version}
 %patch
+%patch1
 %patch2 -p1
 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
@@ -234,10 +238,9 @@ touch Local/eximon.conf
 rm -f doc/*.{orig,txt~}
 
 %build
-make 
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,lib}
@@ -340,7 +343,6 @@ exit 0
 %restart_on_update exim
 %endif
 %insserv_cleanup
-
 %verifyscript
 %verify_permissions -e /usr/sbin/exim