add aarch64 to list of supported archs

[packages/libreoffice.git] / libreoffice.spec

diff --git a/libreoffice.spec b/libreoffice.spec
index aa4d68d5bbc251da8b378d82f44d3784dbbce1c6..af1b445409bca901dbee8e83aae1d1e0de239e5b 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -37,7 +37,7 @@
 %bcond_without system_myspell
 
 # this list is same as icedtea6
-%ifnarch i486 i586 i686 pentium3 pentium4 athlon %{x8664}
+%ifnarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} aarch64
 %undefine      with_java
 %endif
 
@@ -58,7 +58,7 @@ Summary:      LibreOffice - powerful office suite
 Summary(pl.UTF-8):     LibreOffice - potężny pakiet biurowy
 Name:          libreoffice
 Version:       %{major_ver}.4
-Release:       2
+Release:       4
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
@@ -95,6 +95,8 @@ Source28:     https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585
 Patch0:                disable-failing-test.patch
 Patch1:                mdds-1.5-orcus-0.15.patch
 Patch2:                poppler-0.82.patch
+Patch3:                poppler-0.83.patch
+Patch4:                poppler-0.86.patch
 
 URL:           http://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
@@ -278,7 +280,7 @@ Requires:   %{name}-xsltfilter = %{version}-%{release}
 Obsoletes:     libreoffice-testtools
 Obsoletes:     openoffice.org
 Obsoletes:     openoffice.org-testtools
-ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
+ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9 aarch64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags       -fno-strict-aliasing -O2
@@ -3027,6 +3029,8 @@ dialogs.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 for dir in *-%{version}; do
        [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -4012,7 +4016,11 @@ fi
 %if %{with gtk3}
 %files libs-gtk3
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/liblibreofficekitgtk.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk3lo.so
+%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib
+# devel stuff?
+#%{_datadir}/gir-1.0/LOKDocView-0.1.gir
 %endif
 
 %if %{with qt5}