From fb83cf4e42001ee793ccc90349e051e1d4b79471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Mon, 26 Dec 2016 00:47:13 +0300 Subject: [PATCH] Updated to 5.2.4 --- .abf.yml | 8 ++++---- libreoffice.spec | 34 +++++++++++++++++----------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.abf.yml b/.abf.yml index f995f50..9a76c9f 100644 --- a/.abf.yml +++ b/.abf.yml @@ -33,7 +33,7 @@ sources: bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz: 40117ab0f788e43deef6eaf028c88f6abc3a30d0 commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 - libreoffice-5.2.3.3.tar.xz: 651eded1d62816d3dddad42a54573c7812d0c764 - libreoffice-dictionaries-5.2.3.3.tar.xz: 34eb126e79d0518e70acc1fb1933046a966cf648 - libreoffice-help-5.2.3.3.tar.xz: 267db133ad57c737dd3ba0148c714c12238edcb0 - libreoffice-translations-5.2.3.3.tar.xz: 4dc7184bddda89a5915e6802ef7101bcd8d4dee1 + libreoffice-5.2.4.2.tar.xz: e833ad6b88ee1c4b347c827ed442a96e7c003c6e + libreoffice-dictionaries-5.2.4.2.tar.xz: 39a05993569bf1ff8fb2420bf2ebb33941837622 + libreoffice-help-5.2.4.2.tar.xz: 1e92bf8535f1313c5c06ceae88abcc495b515273 + libreoffice-translations-5.2.4.2.tar.xz: 93d707f3490065aeca8bd37e02a48c31f9f2d7f3 diff --git a/libreoffice.spec b/libreoffice.spec index 1e4da00..68c2d43 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -8,26 +8,26 @@ %bcond_with ccache %if %{with l10n} -%define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu -%define helplangs ar bg bn bs ca cs da de dz el en-GB es et eu fi fr gl gu he hi hr hu it ja ko lt lv mk nb nl nn pl pt pt-BR ro ru si sk sl sv ta tr uk zh-CN zh-TW en-US +%define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu +%define helplangs ar bg bn bs ca cs da de dz el en-GB es et eu fi fr gl gu he hi hr hu it ja ko lt lv mk nb nl nn pl pt pt-BR ro ru si sk sl sv ta tr uk zh-CN zh-TW en-US %else -%define langs en-US -%define helplangs en-US +%define langs en-US +%define helplangs en-US %endif %define javaless 1 -%define relurl http://download.documentfoundation.org/libreoffice/src/%{version} -%define devurl http://dev-www.libreoffice.org/ooo_external -%define srcurl http://dev-www.libreoffice.org/src/ -%define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ -%define distroname ROSA -%define ooname libreoffice -%define buildver %{version}.3 -%define ooodir %{_libdir}/libreoffice -%define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1 +%define relurl http://download.documentfoundation.org/libreoffice/src/%{version} +%define devurl http://dev-www.libreoffice.org/ooo_external +%define srcurl http://dev-www.libreoffice.org/src/ +%define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ +%define distroname ROSA +%define ooname libreoffice +%define buildver %{version}.2 +%define ooodir %{_libdir}/libreoffice +%define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1 -%define ccachedir ~/.ccache-OOo +%define ccachedir ~/.ccache-OOo %if %{_use_internal_dependency_generator} %define __noautoreq 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' @@ -40,8 +40,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 5.2.3 -Release: 2 +Version: 5.2.4 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -3514,7 +3514,7 @@ touch external/tarballs/.downloaded # We use make build here because the default target is "allandcheck". # Checking should go to check -make -r -s V=0 \ +%make -r -s V=0 \ ARCH_FLAGS="$ARCH_FLAGS" \ ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \ ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \