From 80b7f4dabaaa99680bfb1f36742e74d86a2f06b9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 6 Jun 2014 13:16:27 +0200 Subject: [PATCH] extract common bundled libs to one place --- libreoffice.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 08665c5..b8f39ba 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -303,14 +303,15 @@ Patch44: 0001-deb-749592-mysql-connector-doesn-t-work-with-remote-.patch # rhbz#1085420 make sure we do not provide bundled libraries %if 0%{?rhel} +%global libo_bundled_libs_common fbembed\\|GLEW\\|mwaw\\|odfgen\\|revenge\\|wps %if 0%{?rhel} < 7 # redland libs are already suffixed -> no need to filter them too -%global libo_bundled_libs_filter /^lib\\(clucene\\|lcms2\\|fbembed\\|GLEW\\|mwaw\\|odfgen\\|revenge\\|wps\\)\\.so.*$/d +%global libo_bundled_libs_filter /^lib\\(clucene\\|lcms2\\|%libo_bundled_libs_common\\)\\.so.*$/d %filter_from_provides %{libo_bundled_libs_filter} %filter_from_requires %{libo_bundled_libs_filter} %filter_setup %else -%global libo_bundled_libs_filter ^lib\\(fbembed\\|GLEW\\|mwaw\\|odfgen\\|revenge\\|wps\\)\\.so.*$ +%global libo_bundled_libs_filter ^lib\\(%libo_bundled_libs_common\\)\\.so.*$ %global __provides_exclude %{libo_bundled_libs_filter} %global __requires_exclude %{libo_bundled_libs_filter} %endif