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

Accepting request 391356 from openSUSE:Factory:ARM

Browse Source 
- update constraints file for aarch64

- enable aarch64 build

OBS-URL: https://build.opensuse.org/request/show/391356
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=399
This commit is contained in:
Tomáš Chvátal 2016-04-23 07:24:30 +00:00 committed by Git OBS Bridge
parent 43e8fbfb38
commit 5a1c428b5a
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
_constraints
View File

@ -1,10 +1,32 @@
<constraints> <constraints>
<hardware>
<physicalmemory> <overwrite>
<size unit="M">6000</size> <conditions>
</physicalmemory> <arch>aarch64</arch>
<disk> </conditions>
<size unit="G">30</size> <hardware>
</disk> <physicalmemory>
</hardware> <size unit="M">2000</size>
</physicalmemory>
<disk>
<size unit="G">40</size>
</disk>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>i586</arch>
<arch>x86_64</arch>
<arch>ppc64</arch>
</conditions>
<hardware>
<physicalmemory>
<size unit="M">4000</size>
</physicalmemory>
<disk>
<size unit="G">40</size>
</disk>
</hardware>
</overwrite>
</constraints> </constraints>

10
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Apr 23 07:09:45 UTC 2016 - dmueller@suse.com
- update constraints file for aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 4 09:17:16 UTC 2016 - tchvatal@suse.com Mon Apr 4 09:17:16 UTC 2016 - tchvatal@suse.com
@ -453,6 +458,11 @@ Sun May 10 10:01:38 UTC 2015 - tchvatal@suse.com
- Version bump to 4.4.3 release: - Version bump to 4.4.3 release:
* Various small fixes all around * Various small fixes all around
-------------------------------------------------------------------
Wed May 6 16:54:47 UTC 2015 - dmueller@suse.com
- enable aarch64 build
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 6 15:26:10 UTC 2015 - tchvatal@suse.com Wed May 6 15:26:10 UTC 2015 - tchvatal@suse.com

8
libreoffice.spec
View File

@ -262,7 +262,7 @@ Obsoletes: %{name}-ure < %{version}
Provides: %{name}-icon-theme-crystal = %{version} Provides: %{name}-icon-theme-crystal = %{version}
Obsoletes: %{name}-icon-theme-crystal < %{version} Obsoletes: %{name}-icon-theme-crystal < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 ExclusiveArch: %arm aarch64 %ix86 x86_64 ppc ppc64
%if %{with kdeintegration} %if %{with kdeintegration}
BuildRequires: libkde4-devel BuildRequires: libkde4-devel
%endif %endif
@ -350,7 +350,7 @@ BuildRequires: gstreamer010-plugins-base-devel
%ifarch %ix86 %ifarch %ix86
Recommends: jre-32 >= 1.6 Recommends: jre-32 >= 1.6
%endif %endif
%ifarch x86_64 %ifarch x86_64 aarch64 ppc64
Recommends: jre-64 >= 1.6 Recommends: jre-64 >= 1.6
%endif %endif
%ifarch ppc %ifarch ppc
@ -773,7 +773,7 @@ Requires(pre): libreoffice = %{version}
Requires: jre-32 > 1.5 Requires: jre-32 > 1.5
Recommends: jre-32 >= 1.6 Recommends: jre-32 >= 1.6
%endif %endif
%ifarch x86_64 %ifarch x86_64 aarch64 ppc64
Requires: jre-64 > 1.5 Requires: jre-64 > 1.5
Recommends: jre-64 >= 1.6 Recommends: jre-64 >= 1.6
%endif %endif
@ -796,7 +796,7 @@ Requires(pre): libreoffice = %{version}
Requires: jre-32 > 1.5 Requires: jre-32 > 1.5
Recommends: jre-32 >= 1.6 Recommends: jre-32 >= 1.6
%endif %endif
%ifarch x86_64 %ifarch x86_64 aarch64 ppc64
Requires: jre-64 > 1.5 Requires: jre-64 > 1.5
Recommends: jre-64 >= 1.6 Recommends: jre-64 >= 1.6
%endif %endif