From 37b90b260bde21d2df0b1cbda047fdd78b778d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 16 Feb 2018 23:40:36 +0100
Subject: [PATCH] Dropped dynlookup-config patch (merged into config patch)

---
 exim-4.90.1-config.patch           |  8 ++++----
 exim-4.90.1-dynlookup-config.patch | 26 --------------------------
 exim.spec                          |  7 ++++---
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 exim-4.90.1-dynlookup-config.patch

diff --git a/exim-4.90.1-config.patch b/exim-4.90.1-config.patch
index c156cd7..1820b94 100644
--- a/exim-4.90.1-config.patch
+++ b/exim-4.90.1-config.patch
@@ -89,9 +89,8 @@ index 72e26ce..0bd97f1 100644
 -# LOOKUP_NISPLUS=yes
 +LOOKUP_LDAP=yes
 +LDAP_LIB_TYPE=OPENLDAP2
-+LOOKUP_INCLUDE=-I/usr/include/mysql
-+LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq
-+LOOKUP_MYSQL=yes
++LOOKUP_LIBS=-lldap -llber -lsqlite3
++LOOKUP_MYSQL=2
 +LOOKUP_MYSQL_PC=mariadb
 +LOOKUP_NIS=yes
 +LOOKUP_NISPLUS=yes
@@ -99,7 +98,8 @@ index 72e26ce..0bd97f1 100644
 -# LOOKUP_PASSWD=yes
 -# LOOKUP_PGSQL=yes
 +LOOKUP_PASSWD=yes
-+LOOKUP_PGSQL=yes
++LOOKUP_PGSQL=2
++LOOKUP_PGSQL_LIBS=-lpq
  # LOOKUP_REDIS=yes
 -# LOOKUP_SQLITE=yes
 -# LOOKUP_SQLITE_PC=sqlite3
diff --git a/exim-4.90.1-dynlookup-config.patch b/exim-4.90.1-dynlookup-config.patch
deleted file mode 100644
index a1ac3e5..0000000
--- a/exim-4.90.1-dynlookup-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/EDITME b/src/EDITME
-index ce2b047..8b773ea 100644
---- a/src/EDITME
-+++ b/src/EDITME
-@@ -311,15 +311,17 @@ LOOKUP_DSEARCH=yes
- # LOOKUP_IBASE=yes
- LOOKUP_LDAP=yes
- LDAP_LIB_TYPE=OPENLDAP2
--LOOKUP_INCLUDE=-I/usr/include/mysql
--LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq
--LOOKUP_MYSQL=yes
-+LOOKUP_LIBS=-lldap -llber -lsqlite3
-+# LOOKUP_INCLUDE=-I/usr/include/mysql
-+# LOOKUP_MYSQL_LIBS=-lmysqlclient
-+LOOKUP_PGSQL_LIBS=-lpq
-+LOOKUP_MYSQL=2
- LOOKUP_MYSQL_PC=mariadb
- LOOKUP_NIS=yes
- LOOKUP_NISPLUS=yes
- # LOOKUP_ORACLE=yes
- LOOKUP_PASSWD=yes
--LOOKUP_PGSQL=yes
-+LOOKUP_PGSQL=2
- # LOOKUP_REDIS=yes
- LOOKUP_SQLITE=yes
- # LOOKUP_WHOSON=yes
diff --git a/exim.spec b/exim.spec
index c7819f9..9d4571f 100644
--- a/exim.spec
+++ b/exim.spec
@@ -14,7 +14,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.90.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -58,7 +58,6 @@ Patch20: exim-4.90.1-allow-filter.patch
 Patch21: exim-4.87-localhost-is-local.patch
 Patch22: exim-4.90.1-greylist-conf.patch
 Patch23: exim-4.90.1-smarthost-config.patch
-Patch25: exim-4.90.1-dynlookup-config.patch
 Patch26: exim-4.85-pic.patch
 Patch27: exim-4.90.1-environment.patch
 # Workaround for NIS removal from glibc, bug 1534920
@@ -209,7 +208,6 @@ greylisting unconditional.
 %patch21 -p1 -b .localhost
 %patch22 -p1 -b .grey
 %patch23 -p1 -b .smarthost
-%patch25 -p1 -b .dynconfig
 %patch26 -p1 -b .fpic
 %patch27 -p1 -b .environment
 %patch33 -p1 -b .nsl-fix
@@ -590,6 +588,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Fri Feb 16 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 4.90.1-3
+- Dropped dynlookup-config patch (merged into config patch)
+
 * Fri Feb 16 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 4.90.1-2
 - Fixed mysql module