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

Accepting request 368292 from LibreOffice:Factory

Browse Source 
- Add patch to build with liborcus 0.11
  * 0001-liborcus-0.11.patch

- Use mdds-1.0
  * 0001-mdds-1.0.patch

- Appdatastore is everywhere

- Add upstreamed patches to fix patch application on sle11:
  * 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
  * 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
  * 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
- Localy disable the services test that SEGVs on sle11
  * libreoffice-disable-services-check.patch

- Do not bother with kde integration on SLE12

OBS-URL: https://build.opensuse.org/request/show/368292
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=106
This commit is contained in:
Dominique Leuenberger 2016-03-11 08:38:01 +00:00 committed by Git OBS Bridge
commit fb3d12d608
8 changed files with 410 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch Normal file
View File

@ -0,0 +1,29 @@
From 2e5d78b3e0ebfaed001bf429df04a98f4b050607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 2 Mar 2016 17:20:23 +0100
Subject: [PATCH] Fix patch to apply on SLE11, just some unknown patch binary
hickup
Change-Id: I6cb707663e2abad8761b172773ee70f9caf4a87d
---
external/libodfgen/libodfgen-bundled-soname.patch.0 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 b/external/libodfgen/libodfgen-bundled-soname.patch.0
index 297cd30..052ba79 100644
--- a/external/libodfgen/libodfgen-bundled-soname.patch.0
+++ b/external/libodfgen/libodfgen-bundled-soname.patch.0
@@ -1,6 +1,7 @@
---- src/Makefile.in.orig 2015-08-07 11:26:16.388774624 +0200
-+++ src/Makefile.in 2015-08-07 11:27:01.428773852 +0200
-@@ -372,7 +372,7 @@
+diff -urN src/Makefile.in.orig src/Makefile.in
+--- src/Makefile.in.orig 2016-03-02 17:17:02.812606210 +0100
++++ src/Makefile.in 2016-03-02 17:17:25.176670151 +0100
+@@ -355,7 +355,7 @@
AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD
libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS)
libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@
--
2.7.2

33
0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch Normal file
View File

@ -0,0 +1,33 @@
From 3cf65156695b965e38f0fd4cacfc9f07e1cd6e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 3 Mar 2016 13:55:34 +0100
Subject: [PATCH] Fix python2 build of pyuno with older py2 versions
SyntaxError: ('invalid syntax', ('//usr/lib64/libreoffice/program//uno.py',
368, 77, " return _ConstantGroup({c.Name.split('.')[-1]:
c.ConstantValue for c in td.Constants})\n"))
Change-Id: Ie87c21fbfd83fc4d6f918eb55128db235c2220a8
---
pyuno/source/module/uno.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index 4c78595..ad77ad3 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -361,7 +361,10 @@ def _impl_getConstantGroupByName( module, group ):
qualifiedName = module + '.' + group
for td in tde:
if td.Name == qualifiedName:
- return _ConstantGroup({c.Name.split('.')[-1]: c.ConstantValue for c in td.Constants})
+ return_dict = dict()
+ for c in td.Constants:
+ return_dict.update({c.Name.split('.')[-1]: c.ConstantValue})
+ return _ConstantGroup(return_dict)
else:
raise ValueError
--
2.7.2

33
0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch Normal file
View File

@ -0,0 +1,33 @@
From 9249f975cb90ef6a18cf8aa53345690e206d10ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 2 Mar 2016 18:21:04 +0100
Subject: [PATCH] Update etonyek patch to apply with sle11 patch
Change-Id: I86b43ba29a6b7d0d4c36491234c3354c3d6edf0c
---
external/libetonyek/libetonyek-bundled-soname.patch.0 | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 753e384..122763d 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,9 +1,11 @@
---- src/lib/Makefile.in.orig 2015-08-07 10:51:32.494810336 +0200
-+++ src/lib/Makefile.in 2015-08-07 10:51:55.493809942 +0200
-@@ -463,5 +463,5 @@
+--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100
++++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100
+@@ -538,7 +538,7 @@
+
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
+libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
EtonyekDocument.cpp
-
+
--
2.7.2

211
0001-liborcus-0.11.patch Normal file
View File

@ -0,0 +1,211 @@
From b325b4c286b56a63316063a3ac4648bf7b7efcbe Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Sat, 5 Mar 2016 20:09:34 -0500
Subject: Update liborcus to 0.11.0.
Markus did half of this, and I simply carried the torch.
Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Index: libreoffice-5.1.0.3/configure.ac
===================================================================
--- libreoffice-5.1.0.3.orig/configure.ac
+++ libreoffice-5.1.0.3/configure.ac
@@ -9141,7 +9141,7 @@ if test -z "$enable_orcus" -o "$enable_o
ENABLE_ORCUS="TRUE"
AC_DEFINE(ENABLE_ORCUS)
- libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0])
+ libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0])
if test "$with_system_orcus" != "yes"; then
if test "$SYSTEM_BOOST" = "TRUE"; then
# ===========================================================
Index: libreoffice-5.1.0.3/sc/source/filter/inc/orcusinterface.hxx
===================================================================
--- libreoffice-5.1.0.3.orig/sc/source/filter/inc/orcusinterface.hxx
+++ libreoffice-5.1.0.3/sc/source/filter/inc/orcusinterface.hxx
@@ -381,6 +381,7 @@ public:
virtual void set_border_count(size_t n) override;
virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
+ virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
@@ -431,6 +432,7 @@ public:
virtual void set_cell_style_name(const char* s, size_t n) override;
virtual void set_cell_style_xf(size_t index) override;
virtual void set_cell_style_builtin(size_t index) override;
+ virtual void set_cell_style_parent_name(const char* s, size_t n) override;
virtual size_t commit_cell_style() override;
};
Index: libreoffice-5.1.0.3/sc/source/filter/orcus/filterdetect.cxx
===================================================================
--- libreoffice-5.1.0.3.orig/sc/source/filter/orcus/filterdetect.cxx
+++ libreoffice-5.1.0.3/sc/source/filter/orcus/filterdetect.cxx
@@ -93,7 +93,7 @@ OUString OrcusFormatDetect::detect(css::
}
orcus::format_t eFormat = orcus::detect(reinterpret_cast<const unsigned char*>(aContent.getStr()), aContent.getLength());
- if (eFormat == orcus::format_gnumeric)
+ if (eFormat == orcus::format_t::gnumeric)
return OUString("Gnumeric XML");
return OUString();
Index: libreoffice-5.1.0.3/sc/source/filter/orcus/interface.cxx
===================================================================
--- libreoffice-5.1.0.3.orig/sc/source/filter/orcus/interface.cxx
+++ libreoffice-5.1.0.3/sc/source/filter/orcus/interface.cxx
@@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_
orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const
{
- return orcus::spreadsheet::formula_grammar_unknown;
+ return orcus::spreadsheet::formula_grammar_t::unknown;
}
ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) :
@@ -231,19 +231,19 @@ double translateToInternal(double nVal,
{
switch(unit)
{
- case orcus::length_unit_inch:
+ case orcus::length_unit_t::inch:
return nVal * 72.0 * 20.0;
break;
- case orcus::length_unit_twip:
+ case orcus::length_unit_t::twip:
return nVal;
break;
- case orcus::length_unit_point:
+ case orcus::length_unit_t::point:
return nVal * 20.0;
break;
- case orcus::length_unit_centimeter:
+ case orcus::length_unit_t::centimeter:
return nVal * 20.0 * 72.0 / 2.54;
break;
- case orcus::length_unit_unknown:
+ case orcus::length_unit_t::unknown:
SAL_WARN("sc.orcus", "unknown unit");
break;
default:
@@ -393,18 +393,18 @@ void ScOrcusConditionalFormat::set_type(
{
switch (type)
{
- case os::conditional_format_condition:
- case os::conditional_format_formula:
+ case os::conditional_format_t::condition:
+ case os::conditional_format_t::formula:
meEntryType = condformat::CONDITION;
// mpCurrentEntry.reset(new ScCondFormatEntry());
break;
- case os::conditional_format_date:
+ case os::conditional_format_t::date:
break;
- case os::conditional_format_colorscale:
+ case os::conditional_format_t::colorscale:
break;
- case os::conditional_format_databar:
+ case os::conditional_format_t::databar:
break;
- case os::conditional_format_iconset:
+ case os::conditional_format_t::iconset:
break;
default:
SAL_INFO("sc.orcus.condformat", "unknown conditional_format_t value");
@@ -549,17 +549,17 @@ formula::FormulaGrammar::Grammar getCalc
formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF;
switch(grammar)
{
- case orcus::spreadsheet::formula_grammar_ods:
+ case orcus::spreadsheet::formula_grammar_t::ods:
eGrammar = formula::FormulaGrammar::GRAM_ODFF;
break;
- case orcus::spreadsheet::formula_grammar_xlsx_2007:
- case orcus::spreadsheet::formula_grammar_xlsx_2010:
+ case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
+ case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
eGrammar = formula::FormulaGrammar::GRAM_OOXML;
break;
- case orcus::spreadsheet::formula_grammar_gnumeric:
+ case orcus::spreadsheet::formula_grammar_t::gnumeric:
eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
break;
- case orcus::spreadsheet::formula_grammar_unknown:
+ case orcus::spreadsheet::formula_grammar_t::unknown:
break;
}
@@ -799,16 +799,16 @@ SvxBoxItemLine getDirection(os::border_d
{
switch (dir)
{
- case os::border_right:
+ case os::border_direction_t::right:
return SvxBoxItemLine::RIGHT;
break;
- case os::border_left:
+ case os::border_direction_t::left:
return SvxBoxItemLine::RIGHT;
break;
- case os::border_top:
+ case os::border_direction_t::top:
return SvxBoxItemLine::RIGHT;
break;
- case os::border_bottom:
+ case os::border_direction_t::bottom:
return SvxBoxItemLine::RIGHT;
break;
default:
@@ -948,15 +948,15 @@ void ScOrcusStyles::set_font_underline(o
{
switch(e)
{
- case orcus::spreadsheet::underline_single:
- case orcus::spreadsheet::underline_single_accounting:
+ case orcus::spreadsheet::underline_t::single_line:
+ case orcus::spreadsheet::underline_t::single_accounting:
maCurrentFont.meUnderline = UNDERLINE_SINGLE;
break;
- case orcus::spreadsheet::underline_double:
- case orcus::spreadsheet::underline_double_accounting:
+ case orcus::spreadsheet::underline_t::double_line:
+ case orcus::spreadsheet::underline_t::double_accounting:
maCurrentFont.meUnderline = UNDERLINE_DOUBLE;
break;
- case orcus::spreadsheet::underline_none:
+ case orcus::spreadsheet::underline_t::none:
maCurrentFont.meUnderline = UNDERLINE_NONE;
break;
}
@@ -1020,6 +1020,12 @@ void ScOrcusStyles::set_border_style(orc
// implement later
}
+void ScOrcusStyles::set_border_style(
+ orcus::spreadsheet::border_direction_t /*dir*/, orcus::spreadsheet::border_style_t /*style*/)
+{
+ // implement later
+}
+
void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t dir,
orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
@@ -1187,6 +1193,11 @@ void ScOrcusStyles::set_cell_style_built
maCurrentCellStyle.mnBuiltInId = index;
}
+void ScOrcusStyles::set_cell_style_parent_name(const char* /*s*/, size_t /*n*/)
+{
+ // place holder
+}
+
size_t ScOrcusStyles::commit_cell_style()
{
SAL_INFO("sc.orcus.style", "commit cell style: " << maCurrentCellStyle.maName);

25
0001-mdds-1.0.patch Normal file
View File

@ -0,0 +1,25 @@
From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Fri, 9 Oct 2015 01:03:29 +0200
Subject: update to mdds 1.0
Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972
Reviewed-on: https://gerrit.libreoffice.org/20251
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 57a41f7..e00df959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===================================================================
dnl Check for system mdds
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
dnl ===================================================================
dnl Check for system glm

13
libreoffice-disable-services-check.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libreoffice-5.1.0.3/postprocess/Module_postprocess.mk
===================================================================
--- libreoffice-5.1.0.3.orig/postprocess/Module_postprocess.mk
+++ libreoffice-5.1.0.3/postprocess/Module_postprocess.mk
@@ -28,8 +28,4 @@ $(eval $(call gb_Module_add_targets,post
))
endif
-$(eval $(call gb_Module_add_check_targets,postprocess,\
- CppunitTest_services \
-))
-
# vim: set noet sw=4 ts=4:

32
libreoffice.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Tue Mar 8 12:18:38 UTC 2016 - tchvatal@suse.com
- Add patch to build with liborcus 0.11
* 0001-liborcus-0.11.patch
-------------------------------------------------------------------
Mon Mar 7 20:49:35 UTC 2016 - tchvatal@suse.com
- Use mdds-1.0
* 0001-mdds-1.0.patch
-------------------------------------------------------------------
Thu Mar 3 08:47:48 UTC 2016 - tchvatal@suse.com
- Appdatastore is everywhere
-------------------------------------------------------------------
Wed Mar 2 16:48:33 UTC 2016 - tchvatal@suse.com
- Add upstreamed patches to fix patch application on sle11:
* 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
* 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
* 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
- Localy disable the services test that SEGVs on sle11
* libreoffice-disable-services-check.patch
-------------------------------------------------------------------
Wed Mar 2 12:55:31 UTC 2016 - tchvatal@suse.com
- Do not bother with kde integration on SLE12
-------------------------------------------------------------------
Sun Feb 21 09:49:35 UTC 2016 - tchvatal@suse.com

44
libreoffice.spec
View File

@ -29,12 +29,6 @@
%else
%bcond_without oldmake
%endif
# Applications datastore
%if 0%{?suse_version} > 1310
%bcond_without appdatastore
%else
%bcond_with appdatastore
%endif
# GTK3, gstreamer and fresh doxygen switch
%if 0%{?suse_version} > 1230
%bcond_without newmedia
@ -47,6 +41,12 @@
%else
%bcond_with systemlibs
%endif
# Wether to enable the kde integration
%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} || 0%{?suse_version} < 1130
%bcond_without kdeintegration
%else
%bcond_with kdeintegration
%endif
# Wether to provide noarch subpackages
%if 0%{?suse_version} > 1130
%bcond_without noarch_subpkgs
@ -171,6 +171,14 @@ Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
# PATCH-FIX-SUSE: do not declare java6 available for without system libs build
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: broken patch command on sle11 fails to apply patch
Patch8: 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
Patch9: 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
Patch11: 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
Patch12: 0001-mdds-1.0.patch
Patch13: 0001-liborcus-0.11.patch
# PATCH-FIX-SUSE: disable services unittest that fails
Patch10: libreoffice-disable-services-check.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -203,7 +211,6 @@ BuildRequires: krb5-devel
BuildRequires: libcppunit-devel
BuildRequires: liberation-fonts
BuildRequires: libexpat-devel
BuildRequires: libkde4-devel
BuildRequires: libpoppler-devel
BuildRequires: libtool
BuildRequires: make
@ -219,6 +226,7 @@ BuildRequires: perl-Compress-Zlib
BuildRequires: procps
BuildRequires: unixODBC-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xorg-x11
BuildRequires: xorg-x11-fonts
BuildRequires: xz
@ -256,6 +264,9 @@ Provides: %{name}-icon-theme-crystal = %{version}
Obsoletes: %{name}-icon-theme-crystal < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %arm %ix86 x86_64 ppc ppc64
%if %{with kdeintegration}
BuildRequires: libkde4-devel
%endif
%if %{with systemlibs}
BuildRequires: boost-devel
BuildRequires: bsh2
@ -272,6 +283,7 @@ BuildRequires: graphite2-devel >= 0.9.3
BuildRequires: harfbuzz-devel
BuildRequires: icu
BuildRequires: junit4
BuildRequires: libXt-devel
BuildRequires: libabw-devel
BuildRequires: libbase
BuildRequires: libcdr-devel >= 0.1
@ -308,7 +320,6 @@ BuildRequires: libwps-devel >= 0.4.2
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lpsolve-devel
BuildRequires: mdds-devel >= 0.12.0
BuildRequires: npapi-sdk
BuildRequires: openCOLLADA-devel
BuildRequires: pentaho-libxml
@ -322,6 +333,7 @@ BuildRequires: ucpp
BuildRequires: vigra-devel
BuildRequires: xml-commons-apis
BuildRequires: pkgconfig(fbembed)
BuildRequires: pkgconfig(mdds-1.0)
%else
BuildRequires: chrpath
%endif
@ -1029,6 +1041,14 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch8 -p1
%patch9 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%if 0%{?suse_version} < 1130
%patch10 -p1
%endif
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}
@ -1187,7 +1207,11 @@ export NOCONFIGURE=yes
--with-external-thes-dir=%{_datadir}/mythes \
--with-help \
--enable-odk \
%if %{with kdeintegration}
--enable-kde4 \
%else
--disable-kde4 \
%endif
--enable-evolution2 \
--enable-dbus \
--enable-hardlink-deliver \
@ -1344,7 +1368,6 @@ done
# Install appdata files, so we're shown in gnome-software (and other, future app stores)
# upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...]
# fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name
%if %{with appdatastore}
install -m 0755 -d %{buildroot}%{_datadir}/appdata
for appdata in base calc draw impress writer; do
sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \
@ -1355,7 +1378,6 @@ for appdata in base calc draw impress writer; do
%endif
rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml
done
%endif
# Remove pointless readmes
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
@ -1616,8 +1638,10 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
%files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root)
%if %{with kdeintegration}
%files -f file-lists/kde4_list.txt kde4
%defattr(-,root,root)
%endif
%files -f file-lists/officebean_list.txt officebean
%defattr(-,root,root)