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

Accepting request 600833 from LibreOffice:Factory

Browse Source 
- Do not require update-desktop-files on 15+ bsc#1090737

- Remove aarch64 condition in _constraints

- Drop patch bnc1083525.patch merged upstream

- Fix build with new icu 61+
  * libreoffice-icu61.patch

- Version update to 6.0.4.1:
  * Another bugfix update containing >60 bugfixes

- LO-L3: DOCX import: missing table background color
  * bnc1083525.patch

- Do not enable LTO on older codestreams, too old toolchain

  * Basically we need ANY font, but liberation-fonts are the

OBS-URL: https://build.opensuse.org/request/show/600833
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2018-04-26 11:35:17 +00:00 committed by Git OBS Bridge
commit 7e3bbe7147
16 changed files with 218 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
_constraints
View File

@ -7,19 +7,4 @@
<size unit="G">25</size>
</disk>
</hardware>
<overwrite>
<conditions>
<arch>aarch64</arch>
</conditions>
<hardware>
<physicalmemory>
<size unit="M">2000</size>
</physicalmemory>
<disk>
<size unit="G">15</size>
</disk>
</hardware>
</overwrite>
</constraints>

3
libreoffice-6.0.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12b8a2f57d797ad51b7661e2302babfe73c0d23b52ddac9f4c7eb1b82472859b
size 203747760

16
libreoffice-6.0.3.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJavQd9AAoJEPQ0oe+v7q6jPzoP+gJSoOVKHM8+6fvInqFZx/Qn
Gr3AvPP04etYNR/GQBQRRKeoqTZpoCxjk1gw9QgmNlO6YMphVktFXZdPTxSbT5bp
vTF/Pb9JGFpOwE0rYXR6fnF5GeLYFhc+Li5Ky/MiAq5jsDZBrvQNCrxlowYi6v3a
V+TBXb/CBlcl3BJ/fUDsSnWDH/yaPPF3zwqUP65DUCiXFu8vEQC2mXpBAUNQQFEx
NM6jOfndIWESYIu/6YmWNwtcWYCfhyzpuzCiW8eTtv/uByzyM4WMRqYRfqXGeqxT
dUr0JTy9sd/yL9HSZY/T11mGJ+t0G8FmeB5Db82OkPefZnSMQKg8eAyNuNsbMLfP
oUCgua+SsjqFApagxKu9+vhc24I9TivyYOL/a5PF3skGGS5lNvcjtfiavkc/GXOj
UgeAeznnasuIYrVh5yI6HKUyRmNkUbllz6pNq71OIXArMe+K5w0uQGBH2PJByioI
VjiRdPafKAv1fGto9a4b9icAhs5FZ25z3GxkgfOoBAgxCpAEWbLqj8+sOqS9rb99
wjZuuaqWpwG8XUODNkkKlIMIxw880kySr6FwNM8Ug9to668juoNtcWERhJQDmy0V
H6MxasMN+B93+nv+0eQoLFwFKWD7Phevch1fqfTD/JYXGu6Wp/SNvlh40F3VEVrn
ZcvLwDjluD7VX5dpDi/J
=PHH2
-----END PGP SIGNATURE-----

3
libreoffice-6.0.4.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbf62884f3d3192fe8ad27690a172485322647c1011dcc09139b0ca254f1bc21
size 204496172

16
libreoffice-6.0.4.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa1kxRAAoJEPQ0oe+v7q6jxGAP/2Li/qf8AVWbY84jaeSU01w+
JwrFBnPUJDbv5VQcY7Z9Z9vcLfh1wgCF+gVyalcZ3aCPl0E/lL/LpYva7Twc68t6
O0XlhIc6A7e455DlVv/vICWOjJQawWqUBPEuITabk/kkuXHFA7yyr2cwKXYgmTmc
5XVUgu7DHdSQVVRrXiXwzDrS1acKyqCeo+0Et6Ad4721Cy35afevI4+eT1HxSa81
JOHtXa7/12luVhW1ecjmpNO9pRkDatKtn81ToVYOQP840OrBGhRsfOTISFBNduxY
QtEVtLJQxhSEV54ctkLi7ZXon9icivI/onoXIW7yMeFdlSbZ2+zLBm4biHPCor/P
2gloiyYY6muoefKkOziXrtpMFDDD2x8yESU5VbRHfwGvU+Tr8NAnvmG/TDhiPnvg
NQs15nUnn6ZG5D0mG6329kcnScgmbf3eb+xfxu1wiEhs+iXpK1hZKpJcyOmhrgKz
A+na22otnReBXezFo71O6+khgOTJ0uuFtfu9nspcf/O/MZLVzS1YkBFQQ328yUjm
OkP16kBh/rwVP0cXV99G8+CrlWdILGO7FvnUf5deOAR3EzQ23c09to5HHX9m+fMz
5cNmjvx3wZ0R/AsMtiLU+3nL6EVMZQOLmgF1B9IokrnztRBzZqqSuHyzzxD48GJp
W5l+OCoHuk0F/qLvI6/P
=Ja54
-----END PGP SIGNATURE-----

3
libreoffice-help-6.0.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06999eac776c4fcf7339732bf988d2b85b7193283d4be622f848706e278e4701
size 2972952

16
libreoffice-help-6.0.3.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJavQeHAAoJEPQ0oe+v7q6jmuoP/jlGZgVLrWO8ib3OoGRdJDzn
c1xrfIBuw+4IWSzPRktw27U/DPdDhv9ydTCuZEnWhwLR5MbYYDiBXo+XQe8tIWC7
cvEvJx+E4JbCCuc4tQrQeM1ZyOIQ6tK0Ncr3RDioxHenko+JVNYlZnfId7IA8My2
cACPPmFpgIg0oyXd+RtEGxRe6lG4BJa7EBqSf3hhjk1w/ym79BV1JezMwNnwgzKg
rYJeCMh1ZMvj72GF3DH2ucIqtNiRAvTTChEc7lfySR4hDqtZi5MY6sGR7Vk7N+A2
/vol0vizY0wlB1BUsvhm8rQDjReM1zhlvrVv58A+C5IuD0F6eoH6qD9FJcI4b5c9
hI9hV3+xafxo53hvvHcmMkoXO20gxNHiTBdORUau2BRXya+lkzkaiXsFV9lTe5tR
80sp7MQIAgAOhxMZDj+IkNu6S56hl4QUsOGrHZ+7m4MQ9od7ODQRnxhGV6rq3P0O
br6T9tyD/j9BybOeP7AKp7fXLoZuNzG9qfIzJ+Kicrjbj18nM+A5s45IV+ZQRT7c
Y8gDUTlTJtQoDjg5B3yGaQz7TIEk0MXb4VMskDJ+/wxyviobIO7jRmjTj9cD+Hzh
QrX+/5PSPAsLTQkJX2U/pCJJl12M0pbeQ8ccfOrxU6FqV1muX5YmrlYh6JkfDD5U
L3NAfbBliU8enm7D9n5t
=RRdV
-----END PGP SIGNATURE-----

3
libreoffice-help-6.0.4.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25424c2be4e323bde79327ccfc293ba63c7319fe0cf71ff12a2c3ebfeb5628d9
size 2973004

16
libreoffice-help-6.0.4.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa1kxaAAoJEPQ0oe+v7q6j+1UP/iqFG3ddTp4+dzSzyd0xSVI8
enhNa1bkvNcldCRJZuQI3xTOmWWBEGD9+QCgqvkuDsWtkcSoESNSbb/FvWIUK8e5
wp2e4RiSEFamK1VSjD4Ufd1aJqvVAsEYJEXY8oiyAmakp7QXNT/Z417gYW/lPTyd
nlei7PwJCAINjvjiEiC7S27Ud5E7+vYW0YphfynPHRXNnyp0cdwnN9LJVS+XrxKZ
c678CoGH+ogIetbbAkIpyd0bc/KSUU+4guUYOkTbAWyTvPUVsI0kVd9pd+peSCJk
Mxo/a0RQFDkf6vPXgrC69aYIpmFt7QxlvKzbIlAKXLG1H/nr4OeQMJ6TthnbgTbA
phbsuHdKzDAJ6gZOKfyh5uOajrwZ3Rr5Th2AW84eDRrItfW7cEAnZ1OxmfSI9hvw
GNNpwKAc9e5HkMH8JqjcwIGIplWOq3SI0uy+b99TNlCa6VOLRn3w+PYp583AOdIY
y3XdpFdyCfC5jrwtKL/zB1iPTeqJZ6bBk5VV2o7x9AMLTe2JS0X1vBlKUQkCYhUq
CgU16aUeMLq3bL3VzrKh+nZnnQ66nVPWBlWLVRHnQveZ2jA+GnVK1RRq+Aqi2Pmh
/2sBPfUaB+A7UWqKuvGLyeIcCrEpQPJeNANGdhTt1aLyiWCKsNBZMITJYNUBn1tO
GguP/8JcwQ1Me060j4w3
=rj9H
-----END PGP SIGNATURE-----

93
libreoffice-icu61.patch Normal file
View File

@ -0,0 +1,93 @@
From f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Mon, 18 Dec 2017 20:28:07 +0100
Subject: Explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: I16b6bc8b8c49713f32424df5fc6db494df7b6892
Reviewed-on: https://gerrit.libreoffice.org/46738
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
i18npool/source/collator/collator_unicode.cxx | 16 ++++++++--------
i18npool/source/collator/gencoll_rule.cxx | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'i18npool/source/collator')
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 71bc4ed..37dc7ee 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -138,7 +138,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
UErrorCode status = U_ZERO_ERROR;
OUString rule = LocaleDataImpl::get()->getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
if (!rule.isEmpty()) {
- collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);
+ collator = new icu::RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);
if (! U_SUCCESS(status)) throw RuntimeException();
}
if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
@@ -343,7 +343,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
size_t ruleImageSize = funclen();
#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
- uca_base = new RuleBasedCollator(static_cast<UChar*>(NULL), status);
+ uca_base = new icu::RuleBasedCollator(static_cast<UChar*>(NULL), status);
#else
// Not only changed ICU 53.1 the API behavior that a negative
// length (ruleImageSize) now leads to failure, but also that
@@ -354,11 +354,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
// The default collator of the en-US locale would also fulfill
// the requirement. The collator of the actual locale or the
// NULL (default) locale does not.
- uca_base = static_cast<RuleBasedCollator*>(icu::Collator::createInstance(
+ uca_base = static_cast<icu::RuleBasedCollator*>(icu::Collator::createInstance(
icu::Locale::getRoot(), status));
#endif
if (! U_SUCCESS(status)) throw RuntimeException();
- collator = new RuleBasedCollator(
+ collator = new icu::RuleBasedCollator(
reinterpret_cast<const uint8_t*>(ruleImage), ruleImageSize, uca_base, status);
if (! U_SUCCESS(status)) throw RuntimeException();
}
@@ -372,17 +372,17 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
*/
icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale), rAlgorithm));
// load ICU collator
- collator = static_cast<RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
+ collator = static_cast<icu::RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
if (! U_SUCCESS(status)) throw RuntimeException();
}
}
if (options & CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT)
- collator->setStrength(Collator::PRIMARY);
+ collator->setStrength(icu::Collator::PRIMARY);
else if (options & CollatorOptions::CollatorOptions_IGNORE_CASE)
- collator->setStrength(Collator::SECONDARY);
+ collator->setStrength(icu::Collator::SECONDARY);
else
- collator->setStrength(Collator::TERTIARY);
+ collator->setStrength(icu::Collator::TERTIARY);
return 0;
}
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index 7d795b5..3048d12 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
//UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
// UCOL_DEFAULT_STRENGTH, &parseError, &status);
- auto coll = o3tl::make_unique<RuleBasedCollator>(reinterpret_cast<const UChar *>(Obuf.getStr()), status);
+ auto coll = o3tl::make_unique<icu::RuleBasedCollator>(reinterpret_cast<const UChar *>(Obuf.getStr()), status);
if (U_SUCCESS(status)) {
std::vector<uint8_t> data;
--
cgit v1.1

3
libreoffice-translations-6.0.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8aa651266b701b17e78aaca77db394bec3da07faf62546496484c63dd519a5b3
size 139138536

16
libreoffice-translations-6.0.3.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJavQeLAAoJEPQ0oe+v7q6jfdsQAK68sI5iIuRTHWbfP3c2wDJg
mb37owUyC2k++4W3pz7U0SSroGwoymtPH6s3ZH0utBuo6cNPZ7Ema8Aucr7BD9x+
ByDL5JlYU/uOPN0nPw2FNnMQZgdJOS9RulpI9ZGGJwISzjUCoD8LRBNvhW1/LmBN
alFBoLOqqoUL0qL3iFD41VRQrEEoLH2mnSfoWqITnh9EWNpVpZrXrjAYLJSgh2K3
oHrb23M6EDN25o5flm7hmdY2bZOvofh45PpXsngxAtYqVRMYQtO/wHwylG95Xcw9
1njWXsk3HL+z3H+Ic1GWLGyvumA9IoeS/ZCgxtjWGlvu1T7PRea+opx/gPjWEqUq
ipI7UWS6gQLWf9OiaWQ0Z/UK6FIOnv4Daig/GEmxkZ5R7VRFO7pu4f3NA/z0ilzs
/0H50HVP6Y9E9fah+30FniiS2+RuT7WfuBbgmAwbYdIUyxBXRCHmgkc2fMiHTFcz
7Qeir9x1r+RwCVcxCZ/2IVUu7O1H18kXecBP/nn79adFS4HRNBfcQrWIKQlQCeiq
ZZebVS7Qg8aXgIPOiZ5JXwjuFCMVwIbgLMc4KC6HSrLLZYRfz+9nBYa3j0pDX9rP
yuPZyP8krGrZ6buhPzaKIeYNXoKjeeDLmjFV7zIDWp9mpDWfXIn9zgbw83GfXH7v
R4aohL1cK3AoUOA+z27E
=a9wg
-----END PGP SIGNATURE-----

3
libreoffice-translations-6.0.4.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c57414653ca36d5f40d6572dc5c1e8be63404b16e323864c80ab473e28b9acaa
size 139188068

16
libreoffice-translations-6.0.4.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJa1kxdAAoJEPQ0oe+v7q6jqs0P/1mnB5FQvFGFyusS6UEBFyrN
ATymAcU4swPHr0clbmNlPnsaWsFi6laq68ZZRWqITTTKbP3v22E0dpaX2urW0YRX
PYIrMmploJFDvsc6FmBQNcViA2VsQU8ldXE+f2zUNnobXWb09UekOwiMDh/v/TEN
iLEgP0nHQ3W5xcI4F27adPvqENiHohqHG4Ro4OXTFlcHlc14jTzA93skEuUw66dX
5FF8LC13eUo3Bbb2KEaZLp5usN5D3ZVtgxG9c3R0Eq/OVcSvlLsyOzFC2z5XG0O/
s5+9c9kl5Uy9WZR6Ac1C/OWzqfn6hdDapHEy66E5l6QH2VCDgOybvTZudm8Rcg2I
j56DijW8/+EOX/2/iwYAyGi3i98VfBx4FOhCsWf26UIWpE5UjLWqmofW3tUQpGPX
9ubE89a5m6hbdiHhQ36t5ybme9QJkM/G6a7qmq7xNZm+gWubdVeHUiotac/PzclV
lvTzsk9Z5VzJ7103nJIwJfVBM00KdSE9AY7BRyzE9qEyVY/2MjHCzDAwQzvRDOsX
XC+u0uItrAa8jRmP+yhsS66Mon8nk/jYC0m5ped8Yp2V3O7IskgOQLzAL1oKjx+A
D9A8JojsgCQv2g8wlcO/zzxMLSyAK7mgQkz86Cubk4LSa4jTvI8j7llEaBZFX9AC
1/f05cONlpOy5raeh6UP
=fcuj
-----END PGP SIGNATURE-----

40
libreoffice.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Apr 25 08:46:16 UTC 2018 - tchvatal@suse.com
- Do not require update-desktop-files on 15+ bsc#1090737
-------------------------------------------------------------------
Wed Apr 25 06:27:49 UTC 2018 - guillaume.gardet@opensuse.org
- Remove aarch64 condition in _constraints
-------------------------------------------------------------------
Mon Apr 23 08:32:48 UTC 2018 - tchvatal@suse.com
- Drop patch bnc1083525.patch merged upstream
-------------------------------------------------------------------
Fri Apr 20 12:39:00 UTC 2018 - tchvatal@suse.com
- Fix build with new icu 61+
* libreoffice-icu61.patch
-------------------------------------------------------------------
Fri Apr 20 08:52:11 UTC 2018 - tchvatal@suse.com
- Version update to 6.0.4.1:
* Another bugfix update containing >60 bugfixes
-------------------------------------------------------------------
Tue Apr 17 10:32:11 UTC 2018 - andras.timar@collabora.com
- LO-L3: DOCX import: missing table background color
* bnc1083525.patch
-------------------------------------------------------------------
Tue Apr 17 09:26:37 UTC 2018 - tchvatal@suse.com
- Do not enable LTO on older codestreams, too old toolchain
-------------------------------------------------------------------
Fri Apr 13 10:49:46 UTC 2018 - tchvatal@suse.com
@ -98,7 +136,7 @@ Thu Mar 22 11:46:48 UTC 2018 - tchvatal@suse.com
Wed Mar 14 09:30:47 UTC 2018 - tchvatal@suse.com
- Require liberation-fonts instead of Recommends wrt bsc#1083213
* Basically we need ANY font, but liberation-fonts are the
* Basically we need ANY font, but liberation-fonts are the
Arial/etc. compatible and thus you can view the MS Word
documents
- Drop Build/Require on xorg-x11-fonts

35
libreoffice.spec
View File

@ -22,8 +22,14 @@
%define numbertext_version 0.9.5
# Urls
%define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.3
%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.4
#%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
# LTO needs newer toolchain stack only
%if 0%{?suse_version} >= 1500
%bcond_without lto
%else
%bcond_with lto
%endif
# Enable the kde integration on openSUSE only
%if 0%{?is_opensuse}
%bcond_without kdeintegration
@ -48,7 +54,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.0.3.2
Version: 6.0.4.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -101,6 +107,8 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
Patch7: bnc1039203.patch
# LO-L3: Slide with chart has some strange (too large?) elements (PPTX)
Patch8: bnc1060128.patch
# PATCH-FROM-UPSTREAM fix build with new icu
Patch9: libreoffice-icu61.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -224,8 +232,6 @@ Requires: libreoffice-branding >= 6.0
Requires: libreoffice-icon-themes = %{version}
Requires: libreoffice-l10n-en = %{version}
Requires: python3
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
Recommends: dejavu-fonts
Recommends: google-carlito-fonts
Provides: %{name}-draw-extensions = %{version}
@ -247,6 +253,10 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64
%if 0%{?suse_version} < 1500
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
%endif
%if %{with gtk3}
BuildRequires: pkgconfig(glib-2.0) >= 2.40
BuildRequires: pkgconfig(gtk+-3.0)
@ -902,6 +912,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch5 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch990 -p1
# Disable some of the failing tests (some are random)
@ -929,9 +940,13 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
source %{_sysconfdir}/profile.d/alljava.sh
# use RPM_OPT_FLAGS, ...
# remove big debugsymbols as we simply consume too much space
%if %{with lto}
ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`"
CFLAGS="$ARCH_FLAGS -flifetime-dse=1"
CXXFLAGS="$ARCH_FLAGS -flifetime-dse=1"
%else
ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`"
%endif
CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS
# Colada does not have .pc file and configure creator was really lazy
@ -951,7 +966,9 @@ export NOCONFIGURE=yes
%configure \
--with-parallelism=%{jobs} \
--enable-eot \
%if %{with lto}
--enable-lto \
%endif
--enable-mergelibs \
--docdir=%{_docdir}/%{name} \
--with-compat-oowrappers \
@ -1269,9 +1286,11 @@ export SRCDIR="./"
%post
/sbin/ldconfig
%if 0%{?suse_version} < 1500
%mime_database_post
%desktop_database_post
%icon_theme_cache_post
%endif
%preun
uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/"
@ -1282,10 +1301,13 @@ exit 0
%postun
/sbin/ldconfig
%if 0%{?suse_version} < 1500
%icon_theme_cache_postun
%desktop_database_postun
%mime_database_postun
%endif
%if 0%{?suse_version} < 1500
%post base
%desktop_database_post
@ -1321,6 +1343,7 @@ exit 0
%postun writer
%desktop_database_postun
%endif
%_link_noarch_files icon-themes