|
|
@ -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
|
|
|
|
# rhbz#1085420 make sure we do not provide bundled libraries
|
|
|
|
%if 0%{?rhel}
|
|
|
|
%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
|
|
|
|
%if 0%{?rhel} < 7
|
|
|
|
# redland libs are already suffixed -> no need to filter them too
|
|
|
|
# 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
|
|
|
|
%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/libflatlo.so
|
|
|
|
%{baseinstdir}/program/libfrmlo.so
|
|
|
|
%{baseinstdir}/program/libfrmlo.so
|
|
|
|
%if 0%{?rhel}
|
|
|
|
%if 0%{?rhel}
|
|
|
|
|
|
|
|
%{baseinstdir}/program/libetonyek-0.1.so.*
|
|
|
|
%{baseinstdir}/program/libGLEW.so.*
|
|
|
|
%{baseinstdir}/program/libGLEW.so.*
|
|
|
|
%{baseinstdir}/program/libmwaw-0.3.so.*
|
|
|
|
%{baseinstdir}/program/libmwaw-0.3.so.*
|
|
|
|
%{baseinstdir}/program/libodfgen-0.1.so.*
|
|
|
|
%{baseinstdir}/program/libodfgen-0.1.so.*
|
|
|
|