diff --git a/0001-mdds-1.0.patch b/0001-mdds-1.0.patch new file mode 100644 index 0000000..dbf1aaf --- /dev/null +++ b/0001-mdds-1.0.patch @@ -0,0 +1,25 @@ +From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001 +From: Markus Mohrhard +Date: Fri, 9 Oct 2015 01:03:29 +0200 +Subject: update to mdds 1.0 + +Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972 +Reviewed-on: https://gerrit.libreoffice.org/20251 +Tested-by: Jenkins +Reviewed-by: Markus Mohrhard +Tested-by: Markus Mohrhard + +diff --git a/configure.ac b/configure.ac +index 57a41f7..e00df959 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST) + dnl =================================================================== + dnl Check for system mdds + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) ++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) + + dnl =================================================================== + dnl Check for system glm + diff --git a/libreoffice.changes b/libreoffice.changes index 0ebaab9..63f6854 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -2,6 +2,7 @@ Mon Mar 7 20:49:35 UTC 2016 - tchvatal@suse.com - Use mdds-1.0 + * 0001-mdds-1.0.patch ------------------------------------------------------------------- Thu Mar 3 08:47:48 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 7c34c10..f6ba62f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -175,6 +175,7 @@ Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch Patch8: 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch Patch9: 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch Patch11: 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch +Patch12: 0001-mdds-1.0.patch # PATCH-FIX-SUSE: disable services unittest that fails Patch10: libreoffice-disable-services-check.patch # try to save space by using hardlinks @@ -1042,6 +1043,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch8 -p1 %patch9 -p1 %patch11 -p1 +%patch12 -p1 %if 0%{?suse_version} < 1130 %patch10 -p1 %endif @@ -1117,13 +1119,6 @@ export PYTHON_CFLAGS=`%{python_type}-config --cflags` export PYTHON_LIBS=`%{python_type}-config --libs` %endif -%if %{with systemlibs} -# FIXME: Adjust with next mdds switch, configure.ac still checks just mdds -# without suffix number -export MDDS_CFLAGS=`pkg-config --cflags mdds-1.0` -export MDDS_LIBS=' ' -%endif - # Old systems need help in finding the gcc %if !%{with newmedia} export CC=%{_bindir}/gcc-4.8