diff --git a/openldap-sql-linking.patch b/openldap-sql-linking.patch deleted file mode 100644 index c7edf8c..0000000 --- a/openldap-sql-linking.patch +++ /dev/null @@ -1,14 +0,0 @@ -Removes unnecessary linking of SQL libraries into slapd. This makes openldap-servers package -independent on libodbc. (SQL backend is packaged separately in openldap-servers-sql.) - ---- openldap-2.4.24.orig/build/top.mk -+++ openldap-2.4.24/build/top.mk -@@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@ - SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@ - SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@ - --SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS) -+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS) - - # Our Defaults - CC = $(AC_CC) diff --git a/openldap.spec b/openldap.spec index 402f813..d1bdade 100644 --- a/openldap.spec +++ b/openldap.spec @@ -29,7 +29,6 @@ Source53: libexec-upgrade-db.sh # patches for 2.4 Patch0: openldap-manpages.patch -Patch1: openldap-sql-linking.patch Patch2: openldap-reentrant-gethostby.patch Patch3: openldap-smbk5pwd-overlay.patch Patch5: openldap-ai-addrconfig.patch @@ -128,7 +127,6 @@ ln -s %{_includedir}/nspr4 include/nspr AUTOMAKE=%{_bindir}/true autoreconf -fi %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch5 -p1 @@ -509,6 +507,7 @@ exit 0 * Thu Mar 1 2018 Matus Honek - 2.4.45-13 - fix: openldap does not use Fedora build flags + makes use of redhat-rpm-config package +- Drop superfluous back-sql linking patch * Wed Feb 28 2018 Matus Honek - 2.4.45-12 - MozNSS Compat. Layer: fix: libldap tlsmc continues even after it fails to extract CA certificates (#1550110)