[openldap] drop the evolution patch

[jsynacek]

commit 44107bb15067aa9b4cf33b9e6a26a739fddcd5f4
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Fri Apr 5 09:39:17 2013 +0200

    drop the evolution patch

 README.evolution              |   22 -----
 openldap-evolution-ntlm.patch |  199 -----------------------------------------
 openldap.spec                 |   59 +-----------
 3 files changed, 4 insertions(+), 276 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index a2d4c26..4c8c149 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -1,15 +1,11 @@
 %global _hardened_build 1
 
-%global evolution_connector_prefix %{_libdir}/evolution-openldap
-%global evolution_connector_includedir %{evolution_connector_prefix}/include
-%global evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
-
 %global systemctl_bin /usr/bin/systemctl
 %global check_password_version 1.1
 
 Name: openldap
 Version: 2.4.35
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -27,7 +23,6 @@ Source52: libexec-check-config.sh
 Source53: libexec-upgrade-db.sh
 Source54: libexec-create-certdb.sh
 Source55: libexec-generate-server-cert.sh
-Source100: README.evolution
 
 # patches for 2.4
 Patch0: openldap-manpages.patch
@@ -52,9 +47,6 @@ Patch16: openldap-nss-pk11-freeslot.patch
 Patch100: openldap-autoconf-pkgconfig-nss.patch
 Patch102: openldap-fedora-systemd.patch
 
-# patches for the evolution library (see README.evolution)
-Patch200: openldap-evolution-ntlm.patch
-
 BuildRequires: cyrus-sasl-devel, nss-devel, krb5-devel, tcp_wrappers-devel, unixODBC-devel
 BuildRequires: glibc-devel, libtool, libtool-ltdl-devel, groff, perl, perl-devel, perl(ExtUtils::Embed)
 # smbk5pwd overlay:
@@ -74,7 +66,6 @@ libraries, and documentation for OpenLDAP.
 Summary: LDAP development libraries and header files
 Group: Development/Libraries
 Requires: openldap%{?_isa} = %{version}-%{release}, cyrus-sasl-devel%{?_isa}
-Provides: openldap-evolution-devel%{?_isa} = %{version}-%{release}
 
 %description devel
 The openldap-devel package includes the development libraries and
@@ -183,15 +174,6 @@ done
 
 popd
 
-# patched static libraries for Evolution
-if ! cp -al openldap-%{version} evo-openldap-%{version} ; then
-	rm -fr evo-openldap-%{version}
-	cp -a  openldap-%{version} evo-openldap-%{version}
-fi
-pushd evo-openldap-%{version}
-%patch200 -p1 -b .evolution-ntlm
-popd
-
 %build
 
 # avoid stray dependencies (linker flag --as-needed)
@@ -244,34 +226,6 @@ pushd openldap-%{version}
 make %{_smp_mflags}
 popd
 
-# build patched static library for Evolution
-pushd evo-openldap-%{version}
-%configure \
-	--enable-debug \
-	--disable-dynamic \
-	--disable-syslog \
-	--disable-proctitle \
-	--enable-ipv6 \
-	--disable-local \
-	\
-	--disable-slapd \
-	\
-	--enable-static \
-	--disable-shared \
-	\
-	--with-cyrus-sasl \
-	--without-fetch \
-	--with-threads \
-	--with-pic \
-	--with-tls=moznss \
-	--with-gnu-ld \
-	\
-	--includedir=%{evolution_connector_includedir} \
-	--libdir=%{evolution_connector_libdir}
-
-make %{_smp_mflags}
-popd
-
 pushd ltb-project-openldap-ppolicy-check-password-%{check_password_version}
 make LDAP_INC="-I../openldap-%{version}/include \
  -I../openldap-%{version}/servers/slapd \
@@ -282,12 +236,6 @@ popd
 
 mkdir -p %{buildroot}%{_libdir}/
 
-# install evolution-specific libraries (conflicting files will be overwriten by generic version)
-pushd evo-openldap-%{version}
-make install DESTDIR=%{buildroot} STRIP=""
-install -m 644 %SOURCE100 %{buildroot}%{evolution_connector_prefix}/
-popd
-
 pushd openldap-%{version}
 make install DESTDIR=%{buildroot} STRIP=""
 popd
@@ -385,7 +333,6 @@ chmod 0644 %{buildroot}%{_datadir}/openldap-servers/DB_CONFIG.example
 
 # remove files which we don't want packaged
 rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{evolution_connector_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/openldap/*.so
 
 rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example
@@ -643,9 +590,11 @@ exit 0
 %{_libdir}/lib*.so
 %{_includedir}/*
 %{_mandir}/man3/*
-%{evolution_connector_prefix}/
 
 %changelog
+* Fri Apr 05 2013 Jan Synáček <jsynacek at redhat.com> 2.4.35-2
+- drop the evolution patch
+
 * Tue Apr 02 2013 Jan Synáček <jsynacek at redhat.com> 2.4.35-1
 - new upstream release (#947235)
 - fix: slapd.service should ensure that network is up before starting (#946921)