diff --git a/gpgme-1.8.0.tar.bz2 b/gpgme-1.8.0.tar.bz2
new file mode 100644
index 0000000..432def9
--- /dev/null
+++ b/gpgme-1.8.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33
+size 1298407
diff --git a/libassuan-2.4.3.tar.bz2 b/libassuan-2.4.3.tar.bz2
new file mode 100644
index 0000000..a8e5c8e
--- /dev/null
+++ b/libassuan-2.4.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71
+size 559867
diff --git a/libgpg-error-1.26.tar.bz2 b/libgpg-error-1.26.tar.bz2
new file mode 100644
index 0000000..b80a576
--- /dev/null
+++ b/libgpg-error-1.26.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69
+size 798096
diff --git a/libreoffice.changes b/libreoffice.changes
index fcf1db2..b8d97b8 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Nov 3 12:21:12 UTC 2017 - tchvatal@suse.com
+
+- Disable the verbosity of the build again, getting complaints of
+ build log is too long...
+
+-------------------------------------------------------------------
+Thu Nov 2 13:36:04 UTC 2017 - tchvatal@suse.com
+
+- Switch to bundled gpgme on old distros where it is not possible
+ to update
+- Rebase scp2-user-config-suse.diff to apply again
+
+-------------------------------------------------------------------
+Thu Nov 2 09:24:49 UTC 2017 - tchvatal@suse.com
+
+- Fix pyuno paths wrt bsc#1059720
+
-------------------------------------------------------------------
Thu Oct 12 10:52:03 UTC 2017 - tchvatal@suse.com
diff --git a/libreoffice.spec b/libreoffice.spec
index 8970a9f..d6f3cb6 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -35,11 +35,16 @@
%else
%bcond_with firebird
%endif
+%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
+%bcond_without system_gpgme
+%else
+%bcond_with system_gpgme
+%endif
Name: libreoffice
Version: 5.4.2.2
Release: 0
Summary: A Free Office Suite (Framework)
-License: LGPL-3.0+ AND MPL-2.0+
+License: LGPL-3.0+ and MPL-2.0+
Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/
Source0: %{tarball_url}/libreoffice-%{version}.tar.xz
@@ -53,6 +58,10 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
# used extensions sources
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+# GPGME bundle list
+Source1000: %{external_url}/gpgme-1.8.0.tar.bz2
+Source1001: %{external_url}/libgpg-error-1.26.tar.bz2
+Source1002: %{external_url}/libassuan-2.4.3.tar.bz2
# 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
@@ -121,7 +130,11 @@ BuildRequires: libcppunit-devel >= 1.14.0
BuildRequires: libexif
BuildRequires: libfonts
BuildRequires: libformula
+%if %{with system_gpgme}
BuildRequires: libgpgmepp-devel
+%else
+BuildRequires: chrpath
+%endif
BuildRequires: libjpeg-devel
BuildRequires: liblayout
BuildRequires: libloader
@@ -1029,6 +1042,11 @@ export NOCONFIGURE=yes
%else
--disable-kde4 \
%endif
+%if %{with system_gpgme}
+ --with-system-gpgmepp \
+%else
+ --without-system-gpgmepp \
+%endif
%if %{with firebird}
--enable-firebird-sdbc \
%else
@@ -1053,21 +1071,12 @@ export NOCONFIGURE=yes
# no coinormp packages for coinmp
# just call make here as we added the jobs in configure
-# The check phase is run here too if it is split with nocheck
-# install of jars get broken sometimes
-make verbose=true build-nocheck
+make build-nocheck
%check
# Run tests only on 64b intel as they are resource hogs
%ifarch x86_64
make
-unset WITH_LANG
-# work around flawed accessibility check
-export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
-export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
-#timeout -k 2m 2h make smoketest.subsequentcheck
-# we don't need this anymore
-rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%endif
%install
@@ -1220,7 +1229,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
# Prepare uno path detection, can't be patched in because it breaks tests
echo "import sys, os" > uno.py
-echo "sys.path.append('%{baseinstdir}/program')" >> uno.py
+echo "sys.path.append('%{_libdir}/%{name}/program')" >> uno.py
echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py
cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py
cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py
@@ -1252,6 +1261,12 @@ echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.t
# Symlink libreofficekit to libdir
ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so
+%if !%{with system_gpgme}
+chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11
+chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgmepp.so.6
+chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libassuan.so.0
+%endif
+
# Symlink uno.py and unohelper.py so that python can find them
# This is done after the cache files generating on purpose
mkdir -p %{buildroot}%{python3_sitelib}
diff --git a/scp2-user-config-suse.diff b/scp2-user-config-suse.diff
index 1d9f728..6ae0a8f 100644
--- a/scp2-user-config-suse.diff
+++ b/scp2-user-config-suse.diff
@@ -3,24 +3,24 @@
scp2/source/ooo/common_brand.scp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu
-index 8e18ca5..7c0b95d 100644
---- officecfg/registry/data/org/openoffice/Setup.xcu
+Index: officecfg/registry/data/org/openoffice/Setup.xcu
+===================================================================
+--- officecfg/registry/data/org/openoffice/Setup.xcu.orig
+++ officecfg/registry/data/org/openoffice/Setup.xcu
-@@ -788,7 +788,7 @@
+@@ -787,7 +787,7 @@
10
-- Libreoffice 3=libreoffice/3,Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8
-+ Libreoffice 3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8
+- Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8
++ Libreoffice 3=libreoffice/3-suse,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8
-diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
-index 7bbf873..0b235a0 100644
---- scp2/source/ooo/common_brand.scp
+Index: scp2/source/ooo/common_brand.scp
+===================================================================
+--- scp2/source/ooo/common_brand.scp.orig
+++ scp2/source/ooo/common_brand.scp
-@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
+@@ -381,7 +381,7 @@ ProfileItem gid_Brand_Profileitem_Bootst
#elif defined MACOSX
Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
#else
@@ -29,6 +29,3 @@ index 7bbf873..0b235a0 100644
#endif
End
---
-1.7.0.1
-