fix missing LDAP support

f41
Caolán McNamara 6 years ago
parent 158ffdc13e
commit 8aafc21c88

@ -0,0 +1,31 @@
From 003eb23e45b9fd010be78429fa0f10a8f8d9d635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 18 Jul 2019 15:50:12 +0100
Subject: [PATCH] missing LDAP
since...
Make LDAP support optional
commit 6776c53b7ce2e431d8636f4e5a755f50f787ec8f
Date: Tue Jan 8 04:53:51 2019 -0500
Change-Id: I4268169809b0dc68b347b28523500453394937de
---
config_host.mk.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/config_host.mk.in b/config_host.mk.in
index 9bde2ff2a214..28d3ae3d2626 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -147,6 +147,7 @@ export DISABLE_GUI=@DISABLE_GUI@
export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@
export ENABLE_IOS_LIBREOFFICELIGHT_APP=@ENABLE_IOS_LIBREOFFICELIGHT_APP@
export ENABLE_JAVA=@ENABLE_JAVA@
+export ENABLE_LDAP=@ENABLE_LDAP@
export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
export ENABLE_LTO=@ENABLE_LTO@
export ENABLE_LWP=@ENABLE_LWP@
--
2.21.0

@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.1 Version: %{libo_version}.1
Release: 1%{?libo_prerelease}%{?dist} Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/ URL: http://www.libreoffice.org/
@ -240,6 +240,7 @@ Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release}
# not upstreamed: upstream wants an automatic restart after a crash; we # not upstreamed: upstream wants an automatic restart after a crash; we
# want a nice abrt report # want a nice abrt report
Patch0: 0001-don-t-suppress-crashes.patch Patch0: 0001-don-t-suppress-crashes.patch
Patch1: 0001-missing-LDAP.patch
%if 0%{?rhel} %if 0%{?rhel}
# not upstreamed # not upstreamed
@ -1537,7 +1538,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libpcrlo.so %{baseinstdir}/program/libpcrlo.so
%{baseinstdir}/program/libpdffilterlo.so %{baseinstdir}/program/libpdffilterlo.so
%{baseinstdir}/program/libprotocolhandlerlo.so %{baseinstdir}/program/libprotocolhandlerlo.so
%{baseinstdir}/program/librecentfile.so
%{baseinstdir}/program/libsaxlo.so %{baseinstdir}/program/libsaxlo.so
%{baseinstdir}/program/libscnlo.so %{baseinstdir}/program/libscnlo.so
%{baseinstdir}/program/libscriptframe.so %{baseinstdir}/program/libscriptframe.so
@ -2134,6 +2134,9 @@ done
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Thu Jul 18 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.3.0.1-2
- missing ldap support
* Tue Jul 16 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.3.0.1-1 * Tue Jul 16 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.3.0.1-1
- move rawhide to 6.3.0 - move rawhide to 6.3.0

Loading…
Cancel
Save