From e3c8784527de07887135dca126ae81ac1a10c7eebe8653b3702ade23bdcdac91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 10 Aug 2016 12:54:18 +0000 Subject: [PATCH 1/2] Accepting request 418289 from home:dimstar:Factory - Update _constraints file: set the 25GB HDD / 4GB RAM limit as general requirement (global) which only aarch64 overrides at the moment. Prior, there was no 'default' limit set and all archs were exceptions. This helps at least ppc64le, which was not part of the limit group and attempted to build on a 4.5GB worker - unsuccessful. Any new arch appering will be bound to the same, new, global limits now. OBS-URL: https://build.opensuse.org/request/show/418289 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=423 --- _constraints | 23 ++++++++--------------- libreoffice.changes | 8 ++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/_constraints b/_constraints index 1380d70..2b787e9 100644 --- a/_constraints +++ b/_constraints @@ -1,4 +1,12 @@ + + + 4000 + + + 25 + + @@ -14,19 +22,4 @@ - - - i586 - x86_64 - ppc64 - - - - 4000 - - - 25 - - - diff --git a/libreoffice.changes b/libreoffice.changes index e94bbd0..1f30fd8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 10 11:21:14 UTC 2016 - dimstar@opensuse.org + +- Update _constraints file: set the 25GB HDD / 4GB RAM limit as + general requirement (global) which only aarch64 overrides at the + moment. Prior, there was no 'default' limit set and all archs + were exceptions. + ------------------------------------------------------------------- Mon Aug 1 08:41:48 UTC 2016 - tchvatal@suse.com From 12992e81c8ae9889242d05a1ad3b9387526c4fd4c41029ba076797fe611d7c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 15 Aug 2016 08:12:22 +0000 Subject: [PATCH 2/2] Accepting request 419237 from home:wolfi323:branches:LibreOffice:Factory - Build KDE integration on openSUSE 13.2 as well I'm using this for weeks now on my 13.2 systems, and haven't noticed any problem at all. OBS-URL: https://build.opensuse.org/request/show/419237 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=424 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 1f30fd8..880a47f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 12 21:02:23 UTC 2016 - wbauer@tmo.at + +- Build KDE integration on openSUSE 13.2 as well + ------------------------------------------------------------------- Wed Aug 10 11:21:14 UTC 2016 - dimstar@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index f879c88..bad15f6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -24,7 +24,7 @@ %define external_url http://dev-www.libreoffice.org/src/ %define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.0 # Wether to enable the kde integration -%if 0%{?is_opensuse} +%if 0%{?is_opensuse} || %{suse_version} == 1320 %bcond_without kdeintegration %else %bcond_with kdeintegration