From d936a9b43cce9a4db30b4042df2b02e179396f52280877b4f3d946854dfb0880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 11 Jul 2017 15:23:01 +0000 Subject: [PATCH] - Use system based xmlsec1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=515 --- libreoffice.changes | 1 + libreoffice.spec | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 1f2c64c..093caad 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,6 +3,7 @@ Tue Jul 11 12:44:57 UTC 2017 - tchvatal@suse.com - Version update to 5.4.0.2: * More fixes from 5.4.0 release branch +- Use system based xmlsec1 ------------------------------------------------------------------- Tue Jul 4 10:05:19 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index cbace3a..4476938 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -56,8 +56,6 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t # This never had an release so just bundle it as per what other distros do Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove -# XMLSec is patched over and over in here -Source2000: %{external_url}/xmlsec1-1.2.24.tar.gz # To build this we would pull cygwin; not worth it Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird @@ -223,6 +221,7 @@ BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(redland) BuildRequires: pkgconfig(sane-backends) +BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24 BuildRequires: pkgconfig(xt) Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version}