[libreoffice] Related: rhbz#1085420 do not provide bundled libs for rhel-7 either
David Tardon
dtardon at fedoraproject.org
Sun Apr 13 14:58:14 UTC 2014
commit 70d2be5374711dbe8dddf518c7d81ba3eecf28ca
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 13 16:57:05 2014 +0200
Related: rhbz#1085420 do not provide bundled libs for rhel-7 either
libreoffice.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index b09cda0..94ed87a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -303,12 +303,18 @@ Patch32: 0001-fix-libetonyek-build.patch
%define fontname opensymbol
# rhbz#1085420 make sure we do not provide bundled libraries
-%if %{?rhel} && 0%{?rhel} < 7
+%if %{?rhel}
+%if 0%{?rhel} < 7
# redland libs are already suffixed -> no need to filter them too
%global libo_bundled_libs_filter /^lib\\(clucene\\|lcms2\\|fbembed\\)\\.so.*$/d
%filter_from_provides %{libo_bundled_libs_filter}
%filter_from_requires %{libo_bundled_libs_filter}
%filter_setup
+%else
+%global libo_bundled_libs_filter ^libfbembed\\.so.*$
+%global __provides_exclude %{libo_bundled_libs_filter}
+%global __requires_exclude %{libo_bundled_libs_filter}
+%endif
%endif
%description
More information about the scm-commits
mailing list