From 37a3e7ea347140721ca9092c83c68d5130c25fc5f60b9b0d08a0ecc27923f042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 20 Aug 2020 08:57:46 +0000 Subject: [PATCH] Accepting request 828065 from home:marxin:memory-constraint Use memoryperjob constraint instead of %limit_build macro. OBS-URL: https://build.opensuse.org/request/show/828065 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=914 --- _constraints | 4 ++++ libreoffice.changes | 5 +++++ libreoffice.spec | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/_constraints b/_constraints index c098220..5217115 100644 --- a/_constraints +++ b/_constraints @@ -1,3 +1,4 @@ + @@ -6,5 +7,8 @@ 25 + + 1200 + diff --git a/libreoffice.changes b/libreoffice.changes index 768a4d8..4afb5d2 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 20 08:55:05 UTC 2020 - Martin Liška + +- Use memoryperjob constraint instead of %limit_build macro. + ------------------------------------------------------------------- Mon Aug 17 06:42:35 UTC 2020 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index b289ebf..4df6d19 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -147,7 +147,6 @@ BuildRequires: libserializer BuildRequires: libtool BuildRequires: lpsolve-devel BuildRequires: make -BuildRequires: memory-constraints BuildRequires: openldap2-devel BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine @@ -1000,7 +999,6 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile # Strip lto from %_lto_cflags as the project has --enable-lto option %define _lto_cflags %{nil} # do not eat all memory -%limit_build -m 1200 # make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ...