pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Reduce the ifarch condition based on new exclusivearch

Browse Source 
- Name directly dependencies that were accidentaly pulled by gtk3
  before

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=626
This commit is contained in:
Tomáš Chvátal 2018-04-04 09:09:53 +00:00 committed by Git OBS Bridge
parent 6d7b307712
commit b861310ff3
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libreoffice.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 3 12:26:41 UTC 2018 - tchvatal@suse.com
- Reduce the ifarch condition based on new exclusivearch
- Name directly dependencies that were accidentaly pulled by gtk3
before
-------------------------------------------------------------------
Tue Apr 3 11:52:09 UTC 2018 - tchvatal@suse.com

23
libreoffice.spec
View File

@ -211,6 +211,7 @@ BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
# We need at least english to launch ourselves.
Requires: liberation-fonts
@ -360,10 +361,10 @@ Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Requires: pentaho-reporting-flow-engine
Supplements: %{name}
%ifarch %{arm} %{ix86} ppc
%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@ -573,10 +574,10 @@ Software Development Kit (SDK).
Summary: OfficeBean Java Bean component for LibreOffice
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
%ifarch %{arm} %{ix86} ppc
%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@ -614,10 +615,10 @@ Requires: libreoffice-calc = %{version}
Requires: libreoffice-pyuno = %{version}
Requires(pre): libreoffice = %{version}
# the watchWindow extension is written in java
%ifarch %{arm} %{ix86} ppc
%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@ -634,10 +635,10 @@ Group: Productivity/Office/Suite
Requires: libreoffice-writer = %{version}
Requires(pre): libreoffice = %{version}
# the wiki extension is written in java
%ifarch %{arm} %{ix86} ppc
%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@ -1229,8 +1230,10 @@ rm pyfiles.txt
cp %{SOURCE3} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc
echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt
# Symlink libreofficekit to libdir
# Symlink gtk3 libreofficekit to libdir
%if %{with gtk3}
ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so
%endif
%if !%{with system_gpgme}
chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11
@ -1346,6 +1349,7 @@ exit 0
%dir %{_datadir}/icons/locolor/32x32/apps
%dir %{_datadir}/icons/locolor/32x32/mimetypes
%if %{with gtk3}
%files -n libreofficekit
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib
@ -1360,6 +1364,7 @@ exit 0
%{_datadir}/gir-1.0/LOKDocView-0.1.gir
%dir %{_includedir}/LibreOfficeKit
%{_includedir}/LibreOfficeKit/*.h
%endif
%files glade
%dir %{_datadir}/glade