dtardon pushed to libreoffice (master). "libetonyek is .so now"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun May 24 20:30:01 UTC 2015


From 4a126f438ddb9ba72e402577f3bbebf920429bb1 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Sun, 24 May 2015 22:28:56 +0200
Subject: libetonyek is .so now


diff --git a/libreoffice.spec b/libreoffice.spec
index 123e5e8..c2c6002 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -333,7 +333,7 @@ Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
 
 # rhbz#1085420 make sure we do not provide bundled libraries
 %if 0%{?rhel}
-%global libo_bundled_libs_common GLEW\\|mwaw\\|odfgen\\|revenge\\|wpd\\|wpg\\|wps
+%global libo_bundled_libs_common etonyek-0.1\\|GLEW\\|mwaw\\|odfgen\\|revenge\\|wpd\\|wpg\\|wps
 %if 0%{?rhel} < 7
 # redland libs are already suffixed -> no need to filter them too
 %global libo_bundled_libs_filter /^lib\\(clucene\\|lcms2\\|%libo_bundled_libs_common\\)\\.so.*$/d
@@ -1720,6 +1720,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{baseinstdir}/program/libflatlo.so
 %{baseinstdir}/program/libfrmlo.so
 %if 0%{?rhel}
+%{baseinstdir}/program/libetonyek-0.1.so.*
 %{baseinstdir}/program/libGLEW.so.*
 %{baseinstdir}/program/libmwaw-0.3.so.*
 %{baseinstdir}/program/libodfgen-0.1.so.*
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=master&id=4a126f438ddb9ba72e402577f3bbebf920429bb1


More information about the scm-commits mailing list