- updated to 2.4.49; no longer links with icu

- updated nosql patch

diff --git a/openldap-nosql.patch b/openldap-nosql.patch
index fe23ccb73a9f2fa82886eebdfdf89aef3512a889..cdb81f814f40809df6591cddc1b70bf3bb179019 100644 (file)
--- a/openldap-nosql.patch
+++ b/openldap-nosql.patch
@@ -1,14 +1,14 @@
 Don't link directly with perl or sql libraries -- they're pulled in by
 demand-loaded backends.
 
---- openldap-2.3.11/build/top.mk.nosql 2005-08-29 14:46:17.000000000 -0400
-+++ openldap-2.3.11/build/top.mk       2005-10-28 21:15:15.000000000 -0400
-@@ -197,7 +197,7 @@
+--- openldap-2.4.49/build/top.mk.orig  2020-02-26 19:49:38.964606730 +0100
++++ openldap-2.4.49/build/top.mk       2020-02-26 19:57:31.642046017 +0100
+@@ -200,7 +200,7 @@
  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_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
+-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
++SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
  
  # Our Defaults
  CC = $(AC_CC)

diff --git a/openldap.spec b/openldap.spec
index 15e2ba102cbaa102db14b2054f0f8f5a18cc9717..dde823ce1687088258f8bba939ad3688972c527b 100644 (file)
--- a/openldap.spec
+++ b/openldap.spec
@@ -22,12 +22,12 @@ Summary(pt_BR.UTF-8):       Clientes e servidor para LDAP
 Summary(ru.UTF-8):     Образцы клиентов LDAP
 Summary(uk.UTF-8):     Зразки клієнтів LDAP
 Name:          openldap
-Version:       2.4.48
-Release:       2
+Version:       2.4.49
+Release:       1
 License:       OpenLDAP Public License
 Group:         Networking/Daemons
 Source0:       ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: 0729a0711fe096831dedc159e0bbe73f
+# Source0-md5: 2a47a6bb4319357ea7b032c45283e79e
 Source1:       http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 # Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
 Source2:       ldap.init
@@ -69,7 +69,6 @@ BuildRequires:        autoconf >= 2.59
 BuildRequires: automake
 %if %{with sasl}
 BuildRequires: cyrus-sasl-devel >= 2.1.15
-BuildRequires: libicu-devel
 %endif
 %if %{with system_db}
 BuildRequires: db-devel >= 4.4