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

Accepting request 524053 from LibreOffice:Factory

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/524053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=137
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:28:29 +00:00 committed by Git OBS Bridge
commit e656107cbc
13 changed files with 292 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-Adapt-getcompver.awk-to-Java-9.patch Normal file
View File

@ -0,0 +1,38 @@
From b44f062df9f541b0a1bea974556483c7a5876b35 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 30 Aug 2017 15:16:22 +0200
Subject: [PATCH] Adapt getcompver.awk to Java 9
...where at least <http://jdk.java.net/9/> "JDK 9 Early-Access Builds" 'java
-version' outputs a single-digit
java version "9"
Change-Id: I7807f56593e5436418b49950ca6c2a178d6721f5
---
solenv/bin/getcompver.awk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index ae08f4e21790..6744c4dc5c7c 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -40,8 +40,13 @@ BEGIN {
/java version/ || /openjdk version/ {
compiler_matched = 1
# match on the format of the java versions ( d[d].d[d].d[d] )
- x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
- CCversion = substr( $0, RSTART, RLENGTH)
+ if (match($0, /[0-9]+\.[0-9]+\.[0-9]+/)) {
+ CCversion = substr($0, RSTART, RLENGTH)
+ } else if (match($0, /[0-9]+\.[0-9]+/)) {
+ CCversion = substr($0, RSTART, RLENGTH) "."
+ } else if (match($0, /[0-9]+/)) {
+ CCversion = substr($0, RSTART, RLENGTH) ".."
+ }
}
/^[0-9]*[.][0-9]*\r*$/ {
if ( compiler_matched == 0 ) {
--
2.14.1

32
0001-This-hunk-breaks-jdk9-build.patch Normal file
View File

@ -0,0 +1,32 @@
From 93157811a1e290416422fea91c5bbc2a03b6324a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Mon, 4 Sep 2017 20:59:02 +0200
Subject: [PATCH 1/2] This hunk breaks jdk9 build
Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
---
external/rhino/rhino1_5R5.patch | 8 --------
1 file changed, 8 deletions(-)
diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch
index e44872e3df8f..40fc6cc9427b 100644
--- a/external/rhino/rhino1_5R5.patch
+++ b/external/rhino/rhino1_5R5.patch
@@ -185,14 +185,6 @@
</target>
<target name="compile" depends="properties,get-swing-ex">
-@@ -68,6 +54,7 @@
- includes="org/**/*.java"
- deprecation="on"
- debug="${debug}">
-+ <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
- </javac>
- <copy todir="${nest}/${classes}">
- <fileset dir="." includes="org/**/*.properties" />
--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2004-03-25 21:54:34.000000000 +0100
+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2009-01-17 20:44:22.000000000 +0100
@@ -470,15 +470,21 @@
--
2.14.1

80
0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch Normal file
View File

@ -0,0 +1,80 @@
From c83aec1d026b9567e7e6d982e4d19f3a566b66d2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 28 Aug 2017 15:35:43 +0200
Subject: [PATCH] tdf#100501: Adapt to Java 9 (at least on Linux x86-64)
Checking with both jdk-9+181_linux-x64_bin.tar.gz and
jre-9+181_linux-x64_bin.tar.gz as currently available at
<http://jdk.java.net/9/> "JDK 9 Early-Access Builds":
For one, make SunVersion::init understand <http://openjdk.java.net/jeps/223>
"JEP 223: New Version-String Scheme" at least insofar as to accept strings like
"9" with less than three dot-separated segments (where the missing segments are
treated like "0").
For another, at least for Linux x86-64, libjvm.so is now apparently located in a
path without an "amd64" architecture segment, "lib/server/libjvm.so". (But
could that also be "client"?) Other platforms may need further adjustments.
Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713
(cherry picked from commit 52ffad9bb7be800790de6d918154dbeade88cadd, plus
cda4cea7cdfc9a8de814b901b3b957f029d36aaf "tdf#100501: Fix thinko")
Reviewed-on: https://gerrit.libreoffice.org/41678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
---
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 3 ++-
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 7f7c4943c8be..7543f497eb83 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -68,7 +68,10 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
- "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
+ "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
+ "/lib/server/libjvm.so",
+ "/lib/client/libjvm.so",
+ "/lib/zero/libjvm.so"
#endif
};
*size = SAL_N_ELEMENTS(ar);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 85f31a383fc6..fb4227da1964 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -88,7 +88,7 @@ bool SunVersion::init(const char *szVersion)
! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit
&& (
//separators after maintenance (1.4.1_01, 1.4.1-beta, or 1.4.1)
- ((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 ))
+ (pCur == pEnd || *pCur == '_' || *pCur == '-')
||
//separators between major-minor and minor-maintenance
(nPart < 2 && *pCur == '.') )
@@ -97,6 +97,8 @@ bool SunVersion::init(const char *szVersion)
pCur + 1 != pEnd
|| rtl::isAsciiDigit(static_cast<unsigned char>(*pCur))) )
{
+ bool afterMaint = pCur == pEnd || *pCur == '_' || *pCur == '-';
+
int len = pCur - pLast;
if (len >= 127)
return false;
@@ -107,6 +109,9 @@ bool SunVersion::init(const char *szVersion)
pLast = pCur;
m_arVersionParts[nPart] = atoi(buf);
+
+ if (afterMaint)
+ nPart = 2;
nPart ++;
nPartPos = 0;
if (nPart == 3)
--
2.14.1

31
0002-Detect-libjawt-automatically-on-java9-too.patch Normal file
View File

@ -0,0 +1,31 @@
From f0e34eaf4969af89eab22331c882a0a8a10e82d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 12 Sep 2017 10:32:26 +0200
Subject: [PATCH 2/2] Detect libjawt automatically on java9 too
Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
---
configure.ac | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f053df0192c7..d99b67676177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7003,7 +7003,12 @@ then
my_java_arch=$host_cpu
;;
esac
- JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
+ # This is where JDK9 puts the library
+ if test -e "$JAVA_HOME/lib/libjawt.so"; then
+ JAWTLIB="-L$JAVA_HOME/lib/ -ljawt"
+ else
+ JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
+ fi
AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
fi
AC_MSG_RESULT([$JAWTLIB])
--
2.14.1

13
java-encoding.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index d20927f8eb27..6a1bd00736ee 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -263,7 +263,7 @@ public class FormatValueUtility
final SectionLayoutController slc = findGroupOrDetail(ref);
if (slc == null)
{
- // {Page, Report} × {Header, Footer} have no usable iteration count
+ // {Page, Report} x {Header, Footer} have no usable iteration count
// err on the side of showing them rather than not showing them
return true;
}

3
libreoffice-5.4.0.3.tar.xz
View File

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

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

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

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

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

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

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

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

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

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

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

32
libreoffice.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Tue Sep 12 08:41:51 UTC 2017 - fstrba@suse.com
- Added patches:
* 0001-This-hunk-breaks-jdk9-build.patch
+ Remove a patch hunk that breaks rhino build
* 0002-Detect-libjawt-automatically-on-java9-too.patch
+ Fix detection of JDK9's libjawt.so
* 0001-Adapt-getcompver.awk-to-Java-9.patch
+ Adapt getcompver.awk to Java 9 where the version might be
single digit
* 0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch
+ Make LibreOffice find Java 9 JVM at runtime
* java-encoding.patch
+ Replace one unnecessary UTF-8 character by an ASCII one
-------------------------------------------------------------------
Mon Aug 28 08:11:19 UTC 2017 - tchvatal@suse.com
- Version update to 5.4.1.2:
* Various bugfixes on 5.4 branch
-------------------------------------------------------------------
Thu Aug 24 07:46:20 UTC 2017 - tchvatal@suse.com
- Fix fail to build with kde integration disabled wrt bsc#1055393
-------------------------------------------------------------------
Fri Aug 11 09:24:28 UTC 2017 - tchvatal@suse.com
- Parse over with spec-cleaner to remove few obsolete declarations
-------------------------------------------------------------------
Fri Aug 4 19:16:58 UTC 2017 - mgorse@suse.com

131
libreoffice.spec
View File

@ -21,9 +21,9 @@
# extensions
%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/5.4.0
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
%define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.1
#%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
# Wether to enable the kde integration
%if 0%{?is_opensuse}
%bcond_without kdeintegration
@ -36,10 +36,10 @@
%bcond_with firebird
%endif
Name: libreoffice
Version: 5.4.0.3
Version: 5.4.1.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0+ and MPL-2.0+
License: LGPL-3.0+ AND MPL-2.0+
Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/
Source0: %{tarball_url}/libreoffice-%{version}.tar.xz
@ -82,20 +82,22 @@ Patch5: mediawiki-no-broken-help.diff
# PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
Patch16: libreoffice-hotfix-disablebrokenshapetest.patch
Patch17: gnome-documents-check-ntimeoutid.patch
# PATCH-FIX-UPSTREAM: remove a patch hunk that breaks rhino build
Patch100: 0001-This-hunk-breaks-jdk9-build.patch
# PATCH-FIX-UPSTREAM: fix detection of JDK9's libjawt.so
Patch101: 0002-Detect-libjawt-automatically-on-java9-too.patch
# PATCH-FIX-UPSTREAM: addapt getcompver.awk to java 9
Patch102: 0001-Adapt-getcompver.awk-to-Java-9.patch
# PATCH-FIX-UPSTREAM: Make LibreOffice find Java 9 JVM at runtime
Patch103: 0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch
Patch104: java-encoding.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
BuildRequires: ant
BuildRequires: autoconf
BuildRequires: awk
BuildRequires: bison
%if 0%{?suse_version} > 1325
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_system-devel
%else
BuildRequires: boost-devel
%endif
BuildRequires: bsh2
BuildRequires: commons-codec
BuildRequires: commons-httpclient
@ -103,6 +105,8 @@ BuildRequires: commons-lang
BuildRequires: commons-logging
BuildRequires: cups-devel
BuildRequires: curl-devel
# Needed for tests
BuildRequires: dejavu-fonts
BuildRequires: doxygen >= 1.8.4
BuildRequires: fdupes
BuildRequires: flex
@ -110,29 +114,19 @@ BuildRequires: flute
BuildRequires: gcc-c++
BuildRequires: glm-devel
# Needed for tests
BuildRequires: dejavu-fonts
# Needed for tests
BuildRequires: google-carlito-fonts
BuildRequires: gperf
BuildRequires: hyphen-devel
BuildRequires: libgpgmepp-devel
# genbrk binary is required
BuildRequires: icu
BuildRequires: java-devel >= 1.6
BuildRequires: junit4
BuildRequires: libbase
BuildRequires: libcppunit-devel >= 1.14.0
%if 0%{?suse_version} >= 1330
BuildRequires: liberation2-fonts
%else
BuildRequires: liberation-fonts
%endif
BuildRequires: libexif
%if %{with firebird}
BuildRequires: pkgconfig(fbclient)
%endif
BuildRequires: libfonts
BuildRequires: libformula
BuildRequires: libgpgmepp-devel
BuildRequires: libjpeg-devel
BuildRequires: liblayout
BuildRequires: libloader
@ -144,11 +138,6 @@ BuildRequires: libtool
BuildRequires: lpsolve-devel
BuildRequires: make
BuildRequires: neon-devel >= 0.26.0
%if %{suse_version} == 1315
BuildRequires: openCOLLADA-devel
%else
BuildRequires: libopenCOLLADA-devel
%endif
BuildRequires: openldap2-devel
BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine
@ -233,11 +222,6 @@ Requires(post): update-desktop-files
Requires(postun): update-desktop-files
Recommends: dejavu-fonts
Recommends: google-carlito-fonts
%if 0%{?suse_version} >= 1330
Recommends: liberation2-fonts
%else
Recommends: liberation-fonts
%endif
Provides: %{name}-draw-extensions = %{version}
Obsoletes: %{name}-draw-extensions < %{version}
Provides: %{name}-impress-extensions = %{version}
@ -256,8 +240,30 @@ Provides: %{name}-icon-theme-crystal = %{version}
Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %arm aarch64 %ix86 x86_64 ppc ppc64 ppc64le s390x
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x
%if 0%{?suse_version} > 1325
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_system-devel
%else
BuildRequires: boost-devel
%endif
%if 0%{?suse_version} >= 1330
BuildRequires: liberation2-fonts
Recommends: liberation2-fonts
%else
BuildRequires: liberation-fonts
Recommends: liberation-fonts
%endif
%if %{with firebird}
BuildRequires: pkgconfig(fbclient)
%endif
%if 0%{?suse_version} == 1315
BuildRequires: openCOLLADA-devel
%else
BuildRequires: libopenCOLLADA-devel
%endif
%if %{with kdeintegration}
BuildRequires: libkde4-devel
%else
@ -405,7 +411,7 @@ Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Requires: pentaho-reporting-flow-engine
Supplements: %{name}
%ifarch %arm %ix86 ppc
%ifarch %{arm} %{ix86} ppc
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
@ -592,7 +598,7 @@ Software Development Kit (SDK).
Summary: OfficeBean Java Bean component for LibreOffice
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
%ifarch %arm %ix86 ppc
%ifarch %{arm} %{ix86} ppc
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
@ -636,7 +642,7 @@ Requires: libreoffice-calc = %{version}
Requires: libreoffice-pyuno = %{version}
Requires(pre): libreoffice = %{version}
# the watchWindow extension is written in java
%ifarch %arm %ix86 ppc
%ifarch %{arm} %{ix86} ppc
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
@ -656,7 +662,7 @@ Group: Productivity/Office/Suite
Requires: libreoffice-writer = %{version}
Requires(pre): libreoffice = %{version}
# the wiki extension is written in java
%ifarch %arm %ix86 ppc
%ifarch %{arm} %{ix86} ppc
Requires: jre-32 >= 1.6
%endif
%ifarch x86_64 aarch64 ppc64 ppc64le s390x
@ -819,7 +825,6 @@ Obsoletes: %{name}-help-%{-q*} < %{version} \
Provides additional %{langname} translations and resources for %{project}. \
\
%files %{pkgname} \
%defattr(-,root,root) \
%{!-E: \
%define autotextdir %{_datadir}/%{name}/share/autotext \
%dir %{autotextdir} \
@ -913,6 +918,11 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch5
%patch16 -p1
%patch17 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch990 -p1
# Do not generate doxygen timestamp
@ -922,7 +932,7 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
%build
# Parallel build settings ...
lo_jobs="%{?jobs:%{jobs}}"
%ifarch %arm
%ifarch %{arm}
%if ! 0%{?qemu_user_space_build:1}
# native hardware is not that powerful
lo_jobs="1"
@ -1052,7 +1062,7 @@ make verbose=true build-nocheck
%check
# Run tests only on 64b intel as they are resource hogs
%ifarch x86_64
make
make
unset WITH_LANG
# work around flawed accessibility check
export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
@ -1201,7 +1211,11 @@ for appdata in base calc draw impress writer; do
%endif
rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml
done
%if %{with kdeintegration}
echo "%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml" >>file-lists/kde4_list.txt
%else
rm -f %{buildroot}%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml
%endif
# Remove pointless readmes
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
@ -1332,7 +1346,6 @@ exit 0
%_link_noarch_files icon-theme-tango
%files -f file-lists/common_list.txt
%defattr(-,root,root)
# ignore helper files for brp-symlink check
%exclude %{_datadir}/%{name}/program/sofficerc
%exclude %{_datadir}/%{name}/program/flat_logo.svg
@ -1353,7 +1366,6 @@ exit 0
%dir %{_datadir}/icons/locolor/32x32/mimetypes
%files -n libreofficekit
%defattr(-,root,root)
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib
%{_libdir}/liblibreofficekitgtk.so
@ -1363,14 +1375,12 @@ exit 0
%{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png
%files -n libreofficekit-devel
%defattr(-,root,root)
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/LOKDocView-0.1.gir
%dir %{_includedir}/LibreOfficeKit
%{_includedir}/LibreOfficeKit/*.h
%files glade
%defattr(-,root,root)
%dir %{_datadir}/glade
%dir %{_datadir}/glade/catalogs
%{_datadir}/glade/catalogs/libreoffice-catalog.xml
@ -1379,84 +1389,62 @@ exit 0
%{_datadir}/glade3/catalogs/libreoffice-catalog.xml
%files gdb-pretty-printers
%defattr(-,root,root)
%{_datadir}/gdb/auto-load/%{_libdir}/%{name}
%{_datadir}/libreoffice/gdb
%files -f file-lists/base_list.txt base
%defattr(-,root,root)
%files -f file-lists/calc_list.txt calc
%defattr(-,root,root)
%files -f file-lists/draw_list.txt draw
%defattr(-,root,root)
%files -f file-lists/math_list.txt math
%defattr(-,root,root)
%files -f file-lists/impress_list.txt impress
%defattr(-,root,root)
%files -f file-lists/writer_list.txt writer
%defattr(-,root,root)
%files -f file-lists/postgresql_list.txt base-drivers-postgresql
%defattr(-,root,root)
%if %{with firebird}
%files base-drivers-firebird
%defattr(-,root,root)
%{_libdir}/libreoffice/program/libfirebird_sdbclo.so
%endif
%files -f file-lists/filters_list.txt filters-optional
%defattr(-,root,root)
%files -f file-lists/mailmerge_list.txt mailmerge
%defattr(-,root,root)
%files -f file-lists/pyuno_list.txt pyuno
%defattr(-,root,root)
%files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root)
%files gtk3
%defattr(-,root,root)
%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
%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)
%files -f file-lists/sdk_list.txt sdk
%defattr(-,root,root)
%dir %{_libdir}/libreoffice/sdk/lib
%files -f file-lists/sdk_doc_list.txt sdk-doc
%defattr(-,root,root)
%files base-drivers-mysql
%defattr(-,root,root)
%{_libdir}/%{name}/share/extensions/mysql-connector-ooo
%files calc-extensions
%defattr(-,root,root)
%{_libdir}/%{name}/share/extensions/ConvertTextToNumber
%{_libdir}/%{name}/share/extensions/nlpsolver
%{_libdir}/%{name}/share/extensions/numbertext
%files writer-extensions
%defattr(-,root,root)
%{_libdir}/%{name}/share/extensions/wiki-publisher
%files icon-theme-breeze
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
@ -1464,21 +1452,18 @@ exit 0
%{_datadir}/%{name}/share/config/images_breeze_dark.zip
%files icon-theme-galaxy
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_galaxy.zip
%files icon-theme-hicontrast
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_hicontrast.zip
%files icon-theme-sifr
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
@ -1486,13 +1471,11 @@ exit 0
%{_datadir}/%{name}/share/config/images_sifr_dark.zip
%files icon-theme-tango
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_tango.zip
%files -f file-lists/branding_upstream.txt branding-upstream
%defattr(-,root,root)
%changelog