[libreoffice/master-3.5: 9/11] merge from master
David Tardon
dtardon at fedoraproject.org
Sun Dec 11 17:22:27 UTC 2011
commit 21da76a2b3875038a44125c83a2cb3960468684a
Merge: d58db04 9390cab
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 11 17:46:52 2011 +0100
merge from master
libreoffice.spec | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
---
diff --cc libreoffice.spec
index aa85082,273653e..99ff152
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@@ -33,37 -32,46 +33,37 @@@ License: LGPLv3 and LGPLv2+ and
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{source_url}/libreoffice-artwork-%{version}.tar.bz2
-Source1: %{source_url}/libreoffice-base-%{version}.tar.bz2
-Source2: %{source_url}/libreoffice-bootstrap-%{version}.tar.bz2
-Source3: %{source_url}/libreoffice-calc-%{version}.tar.bz2
-Source4: %{source_url}/libreoffice-components-%{version}.tar.bz2
-Source5: %{source_url}/libreoffice-extensions-%{version}.tar.bz2
-Source6: %{source_url}/libreoffice-extras-%{version}.tar.bz2
-Source7: %{source_url}/libreoffice-filters-%{version}.tar.bz2
-Source8: %{source_url}/libreoffice-help-%{version}.tar.bz2
-Source9: %{source_url}/libreoffice-impress-%{version}.tar.bz2
-Source10: %{source_url}/libreoffice-libs-core-%{version}.tar.bz2
-Source11: %{source_url}/libreoffice-libs-extern-%{version}.tar.bz2
-Source12: %{source_url}/libreoffice-libs-extern-sys-%{version}.tar.bz2
-Source13: %{source_url}/libreoffice-libs-gui-%{version}.tar.bz2
-Source14: %{source_url}/libreoffice-postprocess-%{version}.tar.bz2
-Source15: %{source_url}/libreoffice-sdk-%{version}.tar.bz2
-Source16: %{source_url}/libreoffice-testing-%{version}.tar.bz2
-Source17: %{source_url}/libreoffice-ure-%{version}.tar.bz2
-Source18: %{source_url}/libreoffice-writer-%{version}.tar.bz2
-Source19: %{source_url}/libreoffice-translations-%{version}.tar.bz2
-Source20: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-Source21: redhat-langpacks.tar.gz
-Source22: libreoffice-multiliblauncher.sh
-Source23: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-Source24: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-Source25: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-Source26: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-Source27: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-Source28: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-Source29: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+
+Source0: %{source_url}/libreoffice-core-%{version}.tar.bz2
+Source1: %{source_url}/libreoffice-binfilter-%{version}.tar.bz2
+Source2: %{source_url}/libreoffice-help-%{version}.tar.bz2
+Source3: %{source_url}/libreoffice-translations-%{version}.tar.bz2
+Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+Source5: redhat-langpacks.tar.gz
+Source6: libreoffice-multiliblauncher.sh
+Source7: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+Source8: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+Source9: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+Source10: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+Source11: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+Source12: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+Source13: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
#backwards compatability.
-Source30: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-Source31: http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+Source14: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+Source15: http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
- %if 0%{?rhel}
+ %if %{defined rhel} && 0%{?rhel} < 7
-Source32: http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-Source33: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
+Source16: http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+Source17: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
%endif
+Source18: http://dev-www.libreoffice.org/src/8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
+Source19: http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+Source20: http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+# TODO: IIRC mysql-connector-cpp is in Fedora. Is it usable?
+Source21: http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
+
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
- BuildRequires: binutils, java-devel <= 1.6.0, boost-devel, zlib-devel
+ BuildRequires: binutils, java-devel < 1.7.0, boost-devel, zlib-devel
BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
BuildRequires: libXext-devel, libXt-devel, libICE-devel, libjpeg-devel, make
@@@ -76,14 -84,16 +76,16 @@@ BuildRequires: lpsolve-devel, bsh, luc
BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp, rsync
BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient, cppunit-devel
BuildRequires: jakarta-commons-lang, poppler-devel, fontpackages-devel
-BuildRequires: pentaho-reporting-flow-engine, vigra-devel, db4-devel
+BuildRequires: pentaho-reporting-flow-engine, vigra-devel, librsvg2-devel
BuildRequires: font(:lang=en)
- %if 0%{?fedora}
- BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel
- BuildRequires: libwps-devel, kdelibs4-devel, junit4, perl-Digest-MD5
- BuildRequires: libdb-devel
- %else
+ %if %{defined rhel} && 0%{?rhel} < 7
-BuildRequires: hsqldb
+BuildRequires: hsqldb, db4-devel
+ %else
+ BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel
-BuildRequires: libwps-devel, junit4, perl(Digest::MD5)
++BuildRequires: libwps-devel, junit4, perl(Digest::MD5), libdb-devel
+ %endif
+ %if %{undefined rhel}
+ BuildRequires: kdelibs4-devel
%endif
Requires: %{name}-writer = %{epoch}:%{version}-%{release}
@@@ -100,17 -110,45 +102,17 @@@ Patch3: openoffice.org-3.0.0.ooo88341.
Patch4: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch7: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch8: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
-Patch9: libreoffice-installfix.patch
-Patch10: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
-Patch11: kde4configure.patch
-Patch12: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
-Patch13: 0001-bubble-down-configure-test-findings-on-visibility.patch
-Patch14: vbahelper.visibility.patch
-Patch15: 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch
-Patch16: 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch
-Patch17: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
-Patch18: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
-Patch19: 0001-Related-rhbz-711087-band-aid.patch
-Patch20: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
-Patch21: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
-Patch22: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
-Patch23: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
-Patch24: 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch
-Patch25: gdb-pretty-printers.patch
-Patch26: 0001-Related-fdo-37195-migrationoo3-not-registered.patch
-Patch27: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
-Patch28: 0001-avoid-using-com.sun.org-apis.patch
-Patch29: 0001-add-Oracle-Java-1.7.0-recognition.patch
-Patch30: 0001-Resolves-fdo-32665-handle-that-FreeSerif-lacks-some-.patch
-Patch31: Backport-reading-AES-encrypted-ODF-1.2-documents.patch
+Patch7: libreoffice-installfix.patch
- %if 0%{?rhel}
+ %if %{defined rhel} && 0%{?rhel} < 7
-Patch32: libreoffice-libwpd08-1.patch
-Patch33: libreoffice-libwpd08-2.patch
-Patch34: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
-Patch35: libreoffice-gcj.patch
-Patch36: libreoffice-rhel6poppler.patch
+Patch8: libreoffice-libwpd08-1.patch
+Patch9: libreoffice-libwpd08-2.patch
+Patch10: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
+Patch11: libreoffice-gcj.patch
+Patch12: libreoffice-rhel6poppler.patch
%endif
-Patch37: 0001-Related-i58612-don-t-crash-anyway.patch
-Patch38: 0001-fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
-Patch39: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
-Patch40: solenv.fix.mk.inheritance.patch
-Patch41: libreoffice-ppc64.patch
-Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
-Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
+# TODO: this in S390 only, so it can wait .-)
+#Patch13: solenv.fix.mk.inheritance.patch
+Patch14: skip-stuck-test.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@@ -759,18 -797,52 +761,18 @@@ mv -f redhat.soc extras/source/palettes
%patch2 -p1 -b .ooo86080.unopkg.bodge.patch
%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch
%patch4 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch5 -p0 -b .ooo101274.opening-a-directory.patch
-%patch6 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch7 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch8 -p0 -b .ooo113273.desktop.resolvelinks.patch
-%patch9 -p1 -b .libreoffice-installfix.patch
-%patch10 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch
-%patch11 -p0 -b .kde4configure.patch
-%patch12 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
-%patch13 -p1 -b .bubble-down-configure-test-findings-on-visibility.patch
-%patch14 -p0 -b .vbahelper.visibility.patch
-%patch15 -p1 -b .rhbz702635-set-correct-page-number-when-exporting-s.patch
-%patch16 -p1 -b .rhbz652604-better-survive-exceptions-thrown.patch
-%patch17 -p1 -b .rhbz713154-pdf-export-dialog-too-tall-to-f.patch
-%patch18 -p1 -b .rhbz702833-addEventListener-without-removeE.patch
-%patch19 -p1 -b .rhbz711087-band-aid.patch
-%patch20 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
-%patch21 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
-%patch22 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch
-%patch23 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch
-%patch24 -p1 -b .rhbz730225-avoid-segv-in-ld-this-was-set-to.patch
-%patch25 -p1
-%patch26 -p1 -b .fdo37195-migrationoo3-not-registered.patch
-%patch27 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
-%patch28 -p1 -b .avoid-using-com.sun.org-apis.patch
-%patch29 -p1 -b .add-Oracle-Java-1.7.0-recognition.patch
-%patch30 -p1 -b .fdo32665-handle-that-FreeSerif-lacks-some-.patch
-%patch31 -p1 -b .Backport-reading-AES-encrypted-ODF-1.2-documents.patch
+%patch5 -p1 -b .ooo101274.opening-a-directory.patch
+%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch7 -p1 -b .libreoffice-installfix.patch
- %if 0%{?rhel}
+ %if %{defined rhel} && 0%{?rhel} < 7
-%patch32 -p1 -b .libwpd08-1.patch
-%patch33 -p1 -R -b .libreoffice-libwpd08-2.patch
-%patch34 -p1 -R -b .wpsimport
-%patch35 -p1 -b .gcj.patch
-%patch36 -p0 -b .rhel6poppler.patch
+%patch8 -p1 -b .libwpd08-1.patch
+%patch9 -p1 -R -b .libreoffice-libwpd08-2.patch
+%patch10 -p1 -R -b .wpsimport
+%patch11 -p1 -b .gcj.patch
+%patch12 -p0 -b .rhel6poppler.patch
%endif
-%patch37 -p1 -b .i58612-don-t-crash-anyway.patch
-%patch38 -p1 -b .fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch
-%patch39 -p1 -b .rhbz753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
-%patch40 -p1 -b .solenv.fix.mk.inheritance.patch
-%patch41 -p1 -b .libreoffice-ppc64.patch
-%patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch
-%patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
-
-# these are horribly incomplete--empty translations and copied english
-# strings with spattering of translated strings
-rm -rf translations/source/{gu,he,hr}/helpcontent2
-chmod +x solenv/bin/install-gdb-printers
+#%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
+%patch14 -p1 -b .skip-stuck-test.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@@ -833,51 -908,25 +841,51 @@@ autocon
%{distrooptions}
mkdir -p ext_sources
-cp %{SOURCE20} ext_sources
-cp %{SOURCE23} ext_sources
-cp %{SOURCE24} ext_sources
-cp %{SOURCE25} ext_sources
-cp %{SOURCE26} ext_sources
-cp %{SOURCE27} ext_sources
-cp %{SOURCE28} ext_sources
-cp %{SOURCE29} ext_sources
-cp %{SOURCE30} ext_sources
-cp %{SOURCE31} ext_sources
+cp %{SOURCE4} ext_sources
+cp %{SOURCE7} ext_sources
+cp %{SOURCE8} ext_sources
+cp %{SOURCE9} ext_sources
+cp %{SOURCE10} ext_sources
+cp %{SOURCE11} ext_sources
+cp %{SOURCE12} ext_sources
+cp %{SOURCE13} ext_sources
+cp %{SOURCE14} ext_sources
+cp %{SOURCE15} ext_sources
- %if 0%{?rhel}
+ %if %{defined rhel} && 0%{?rhel} < 7
-cp %{SOURCE32} ext_sources
-cp %{SOURCE33} ext_sources
+cp %{SOURCE16} ext_sources
+cp %{SOURCE17} ext_sources
%endif
+cp %{SOURCE18} ext_sources
+cp %{SOURCE19} ext_sources
+cp %{SOURCE20} ext_sources
+cp %{SOURCE21} ext_sources
touch src.downloaded
-. ./*[Ee]nv.[Ss]et.sh
+. ./Env.Host.sh
./bootstrap
+#HANGING JAVA HACK
+cat << \EOF > solenv/bin/java
+#!/bin/sh
+status=1
+count=1
+while [ $status -ne 0 -a $count -lt 10 ]
+do
+ timeout -k 5m 5m $REALJAVA $*
+ status=$?
+ if [ $status -ne 0 ]; then
+ echo $REALJAVA hung, trying again, attempt $count
+ fi
+ count=$[count+1]
+done
+exit $status
+EOF
+chmod +x solenv/bin/java
+export REALJAVA=`which java`
+export PATH=solenv/bin:$PATH
+which java
+#HANGING JAVA HACK
+
cd instsetoo_native
if ! VERBOSE=true build --dlv_switch -link -P$NBUILDS --all -- -P$NDMAKES -s; then
build --dlv_switch -link --all
@@@ -1280,348 -1364,350 +1288,348 @@@ rm -rf $RPM_BUILD_ROO
%files core
%defattr(-,root,root,-)
-%dir %{basisinstdir}
-%dir %{basisinstdir}/help
-%docdir %{basisinstdir}/help/en
-%dir %{basisinstdir}/help/en
-%{basisinstdir}/help/en/default.css
-%{basisinstdir}/help/en/err.html
-%{basisinstdir}/help/en/highcontrast1.css
-%{basisinstdir}/help/en/highcontrast2.css
-%{basisinstdir}/help/en/highcontrastblack.css
-%{basisinstdir}/help/en/highcontrastwhite.css
-%{basisinstdir}/help/en/sbasic.*
-%{basisinstdir}/help/en/schart.*
-%{basisinstdir}/help/en/shared.*
-%{basisinstdir}/help/idxcaption.xsl
-%{basisinstdir}/help/idxcontent.xsl
-%{basisinstdir}/help/main_transform.xsl
-%{basisinstdir}/presets
-%dir %{basisinstdir}/program
-%{basisinstdir}/program/addin
-%{basisinstdir}/program/basprov%{SOPOST}.uno.so
-%{basisinstdir}/program/canvasfactory.uno.so
-%{basisinstdir}/program/cde-open-url
-%dir %{basisinstdir}/program/classes
-%{basisinstdir}/program/classes/agenda.jar
-%{basisinstdir}/program/classes/commonwizards.jar
-%{basisinstdir}/program/classes/fax.jar
-%{basisinstdir}/program/classes/form.jar
-%{basisinstdir}/program/classes/query.jar
-%{basisinstdir}/program/classes/letter.jar
-%{basisinstdir}/program/classes/LuceneHelpWrapper.jar
-%{basisinstdir}/program/classes/officebean.jar
-%{basisinstdir}/program/classes/report.jar
-%{basisinstdir}/program/classes/saxon9.jar
-%{basisinstdir}/program/classes/ScriptFramework.jar
-%{basisinstdir}/program/classes/ScriptProviderForJava.jar
-%{basisinstdir}/program/classes/table.jar
-%{basisinstdir}/program/classes/unoil.jar
-%{basisinstdir}/program/classes/web.jar
-%{basisinstdir}/program/classes/XMergeBridge.jar
-%{basisinstdir}/program/classes/xmerge.jar
-%{basisinstdir}/program/classes/XSLTFilter.jar
-%{basisinstdir}/program/classes/XSLTValidate.jar
-%{basisinstdir}/program/cmdmail.uno.so
-%{basisinstdir}/program/deployment%{SOPOST}.uno.so
-%{basisinstdir}/program/deploymentgui%{SOPOST}.uno.so
-%{basisinstdir}/program/dlgprov%{SOPOST}.uno.so
-%{basisinstdir}/program/fastsax.uno.so
-%{basisinstdir}/program/fpicker.uno.so
-%{basisinstdir}/program/fps_gnome.uno.so
-%{basisinstdir}/program/fps_office.uno.so
-%{basisinstdir}/program/fundamentalbasisrc
-%{basisinstdir}/program/gnome-open-url
-%{basisinstdir}/program/gnome-open-url.bin
-%{basisinstdir}/program/hatchwindowfactory.uno.so
-%{basisinstdir}/program/i18nsearch.uno.so
-%{basisinstdir}/program/kde-open-url
-%{basisinstdir}/program/legacy_binfilters.rdb
-%{basisinstdir}/program/libacc%{SOPOST}.so
-%{basisinstdir}/program/libadabas%{SOPOST}.so
-%{basisinstdir}/program/libavmedia*.so
-%{basisinstdir}/program/libbasctl%{SOPOST}.so
-%{basisinstdir}/program/libbf_sb%{SOPOST}.so
-%{basisinstdir}/program/libbf_frm%{SOPOST}.so
-%{basisinstdir}/program/libbf_go%{SOPOST}.so
-%{basisinstdir}/program/libbf_migratefilter%{SOPOST}.so
-%{basisinstdir}/program/libbf_ofa%{SOPOST}.so
-%{basisinstdir}/program/libbf_sch%{SOPOST}.so
-%{basisinstdir}/program/libbf_sd%{SOPOST}.so
-%{basisinstdir}/program/libbf_so%{SOPOST}.so
-%{basisinstdir}/program/libbf_svt%{SOPOST}.so
-%{basisinstdir}/program/libbf_svx%{SOPOST}.so
-%{basisinstdir}/program/libbf_wrapper%{SOPOST}.so
-%{basisinstdir}/program/libbf_xo%{SOPOST}.so
-%{basisinstdir}/program/libbib%{SOPOST}.so
-%{basisinstdir}/program/libbindet%{SOPOST}.so
-%{basisinstdir}/program/libcached1.so
-%{basisinstdir}/program/libcanvastools%{SOPOST}.so
-%{basisinstdir}/program/libchart*%{SOPOST}.so
-%{basisinstdir}/program/libcollator_data.so
-%{basisinstdir}/program/libcppcanvas%{SOPOST}.so
-%{basisinstdir}/program/libctl%{SOPOST}.so
-%{basisinstdir}/program/libcui%{SOPOST}.so
-%{basisinstdir}/program/libdba%{SOPOST}.so
-%{basisinstdir}/program/libdbase%{SOPOST}.so
-%{basisinstdir}/program/libdbaxml%{SOPOST}.so
-%{basisinstdir}/program/libdbmm%{SOPOST}.so
-%{basisinstdir}/program/libdbpool2.so
-%{basisinstdir}/program/libdbtools%{SOPOST}.so
-%{basisinstdir}/program/libdbu%{SOPOST}.so
-%{basisinstdir}/program/libdeploymentmisc%{SOPOST}.so
-%{basisinstdir}/program/libdesktop_detector%{SOPOST}.so
-%{basisinstdir}/program/libdict_ja.so
-%{basisinstdir}/program/libdict_zh.so
-%{basisinstdir}/program/libdrawinglayer%{SOPOST}.so
-%{basisinstdir}/program/libediteng%{SOPOST}.so
-%{basisinstdir}/program/libembobj.so
-%{basisinstdir}/program/libemboleobj.so
-%{basisinstdir}/program/libevoab*.so
-%{basisinstdir}/program/libevtatt.so
-%{basisinstdir}/program/libegi%{SOPOST}.so
-%{basisinstdir}/program/libeme%{SOPOST}.so
-%{basisinstdir}/program/libepb%{SOPOST}.so
-%{basisinstdir}/program/libepg%{SOPOST}.so
-%{basisinstdir}/program/libepp%{SOPOST}.so
-%{basisinstdir}/program/libeps%{SOPOST}.so
-%{basisinstdir}/program/libept%{SOPOST}.so
-%{basisinstdir}/program/libera%{SOPOST}.so
-%{basisinstdir}/program/libeti%{SOPOST}.so
-%{basisinstdir}/program/libexp%{SOPOST}.so
-%{basisinstdir}/program/libicd%{SOPOST}.so
-%{basisinstdir}/program/libicg%{SOPOST}.so
-%{basisinstdir}/program/libidx%{SOPOST}.so
-%{basisinstdir}/program/libime%{SOPOST}.so
-%{basisinstdir}/program/libindex_data.so
-%{basisinstdir}/program/libipb%{SOPOST}.so
-%{basisinstdir}/program/libipd%{SOPOST}.so
-%{basisinstdir}/program/libips%{SOPOST}.so
-%{basisinstdir}/program/libipt%{SOPOST}.so
-%{basisinstdir}/program/libipx%{SOPOST}.so
-%{basisinstdir}/program/libira%{SOPOST}.so
-%{basisinstdir}/program/libitg%{SOPOST}.so
-%{basisinstdir}/program/libiti%{SOPOST}.so
-%{basisinstdir}/program/libofficebean.so
-%{basisinstdir}/program/liboooimprovecore%{SOPOST}.so
-%{basisinstdir}/program/libfile%{SOPOST}.so
-%{basisinstdir}/program/libfilterconfig1.so
-%{basisinstdir}/program/libflat%{SOPOST}.so
-%{basisinstdir}/program/libfrm%{SOPOST}.so
-%{basisinstdir}/program/libguesslang%{SOPOST}.so
-%{basisinstdir}/program/libhelplinker%{SOPOST}.so
-%{basisinstdir}/program/libhyphen%{SOPOST}.so
-%{basisinstdir}/program/libi18nregexpgcc3.so
-%{basisinstdir}/program/libjdbc%{SOPOST}.so
-%{basisinstdir}/program/liblegacy_binfilters%{SOPOST}.so
-%{basisinstdir}/program/liblng%{SOPOST}.so
-%{basisinstdir}/program/liblog%{SOPOST}.so
-%{basisinstdir}/program/liblocaledata_en.so
-%{basisinstdir}/program/liblocaledata_es.so
-%{basisinstdir}/program/liblocaledata_euro.so
-%{basisinstdir}/program/liblocaledata_others.so
-%{basisinstdir}/program/libmcnttype.so
-%{basisinstdir}/program/libmozbootstrap.so
-%{basisinstdir}/program/libmsfilter%{SOPOST}.so
-%{basisinstdir}/program/libmtfrenderer.uno.so
-%{basisinstdir}/program/libmysql%{SOPOST}.so
-%{basisinstdir}/program/libodbc%{SOPOST}.so
-%{basisinstdir}/program/libodbcbase%{SOPOST}.so
-%{basisinstdir}/program/liboffacc%{SOPOST}.so
-%{basisinstdir}/program/liboox%{SOPOST}.so
-%{basisinstdir}/program/libpcr%{SOPOST}.so
-%{basisinstdir}/program/libpdffilter%{SOPOST}.so
-%{basisinstdir}/program/libpl%{SOPOST}.so
-%{basisinstdir}/program/libpreload%{SOPOST}.so
-%{basisinstdir}/program/libprotocolhandler%{SOPOST}.so
-%{basisinstdir}/program/libqstart_gtk%{SOPOST}.so
-%{basisinstdir}/program/librecentfile.so
-%{basisinstdir}/program/libres%{SOPOST}.so
-%{basisinstdir}/program/libsax%{SOPOST}.so
-%{basisinstdir}/program/libscn%{SOPOST}.so
-%{basisinstdir}/program/libscriptframe.so
-%{basisinstdir}/program/libsd%{SOPOST}.so
-%{basisinstdir}/program/libsdfilt%{SOPOST}.so
-%{basisinstdir}/program/libsdbc2.so
-%{basisinstdir}/program/libsdbt%{SOPOST}so
-%{basisinstdir}/program/libsdd%{SOPOST}.so
-%{basisinstdir}/program/libsdui%{SOPOST}.so
-%{basisinstdir}/program/libspa%{SOPOST}.so
-%{basisinstdir}/program/libspell%{SOPOST}.so
-%{basisinstdir}/program/libsrtrs1.so
-%{basisinstdir}/program/libsts%{SOPOST}.so
-%{basisinstdir}/program/libsvx%{SOPOST}.so
-%{basisinstdir}/program/libsvxcore%{SOPOST}.so
-%{basisinstdir}/program/libsw%{SOPOST}.so
-%{basisinstdir}/program/libtextconv_dict.so
-%{basisinstdir}/program/libtextconversiondlgs%{SOPOST}.so
-%{basisinstdir}/program/libtvhlp1.so
-%{basisinstdir}/program/libodfflatxml%{SOPOST}.so
-%{basisinstdir}/program/libucbhelper4gcc3.so
-%{basisinstdir}/program/libucpchelp1.so
-%{basisinstdir}/program/libucpdav1.so
-%{basisinstdir}/program/libucpftp1.so
-%{basisinstdir}/program/libucphier1.so
-%{basisinstdir}/program/libucppkg1.so
-%{basisinstdir}/program/libunordf%{SOPOST}.so
-%{basisinstdir}/program/libunopkgapp.so
-%{basisinstdir}/program/libunoxml%{SOPOST}.so
-%{basisinstdir}/program/libupdchk%{SOPOST}.so
-%{basisinstdir}/program/libuui%{SOPOST}.so
-%{basisinstdir}/program/libvbahelper%{SOPOST}.so
-%{basisinstdir}/program/libvclplug_gen%{SOPOST}.so
-%{basisinstdir}/program/libvclplug_gtk%{SOPOST}.so
+%dir %{baseinstdir}
+%dir %{baseinstdir}/help
+%docdir %{baseinstdir}/help/en
+%dir %{baseinstdir}/help/en
+%{baseinstdir}/help/en/default.css
+%{baseinstdir}/help/en/err.html
+%{baseinstdir}/help/en/highcontrast1.css
+%{baseinstdir}/help/en/highcontrast2.css
+%{baseinstdir}/help/en/highcontrastblack.css
+%{baseinstdir}/help/en/highcontrastwhite.css
+%{baseinstdir}/help/en/sbasic.*
+%{baseinstdir}/help/en/schart.*
+%{baseinstdir}/help/en/shared.*
+%{baseinstdir}/help/idxcaption.xsl
+%{baseinstdir}/help/idxcontent.xsl
+%{baseinstdir}/help/main_transform.xsl
+%{baseinstdir}/presets
+%dir %{baseinstdir}/program
+%{baseinstdir}/program/addin
+%{baseinstdir}/program/basprov.uno.so
+%{baseinstdir}/program/canvasfactory.uno.so
+%{baseinstdir}/program/cde-open-url
+%dir %{baseinstdir}/program/classes
+%{baseinstdir}/program/classes/agenda.jar
+%{baseinstdir}/program/classes/commonwizards.jar
+%{baseinstdir}/program/classes/fax.jar
+%{baseinstdir}/program/classes/form.jar
+%{baseinstdir}/program/classes/query.jar
+%{baseinstdir}/program/classes/letter.jar
+%{baseinstdir}/program/classes/LuceneHelpWrapper.jar
+%{baseinstdir}/program/classes/officebean.jar
+%{baseinstdir}/program/classes/report.jar
+%{baseinstdir}/program/classes/saxon9.jar
+%{baseinstdir}/program/classes/ScriptFramework.jar
+%{baseinstdir}/program/classes/ScriptProviderForJava.jar
+%{baseinstdir}/program/classes/table.jar
+%{baseinstdir}/program/classes/unoil.jar
+%{baseinstdir}/program/classes/web.jar
+%{baseinstdir}/program/classes/XMergeBridge.jar
+%{baseinstdir}/program/classes/xmerge.jar
+%{baseinstdir}/program/classes/XSLTFilter.jar
+%{baseinstdir}/program/classes/XSLTValidate.jar
+%{baseinstdir}/program/cmdmail.uno.so
+%{baseinstdir}/program/libdeployment.so
+%{baseinstdir}/program/libdeploymentgui.so
+%{baseinstdir}/program/dlgprov.uno.so
+%{baseinstdir}/program/expwrap.uno.so
+%{baseinstdir}/program/fastsax.uno.so
+%{baseinstdir}/program/fpicker.uno.so
+%{baseinstdir}/program/fps_office.uno.so
+%{baseinstdir}/program/gnome-open-url
+%{baseinstdir}/program/gnome-open-url.bin
+%{baseinstdir}/program/hatchwindowfactory.uno.so
+%{baseinstdir}/program/i18nsearch.uno.so
+%{baseinstdir}/program/legacy_binfilters.rdb
+%{baseinstdir}/program/libacc%{SOPOST}.so
+%{baseinstdir}/program/libavmedia*.so
+%{baseinstdir}/program/libbasctl%{SOPOST}.so
+%{baseinstdir}/program/libbf_sb%{SOPOST}.so
+%{baseinstdir}/program/libbf_frm%{SOPOST}.so
+%{baseinstdir}/program/libbf_go%{SOPOST}.so
+%{baseinstdir}/program/libbf_migratefilter%{SOPOST}.so
+%{baseinstdir}/program/libbf_ofa%{SOPOST}.so
+%{baseinstdir}/program/libbf_sch%{SOPOST}.so
+%{baseinstdir}/program/libbf_sd%{SOPOST}.so
+%{baseinstdir}/program/libbf_so%{SOPOST}.so
+%{baseinstdir}/program/libbf_svt%{SOPOST}.so
+%{baseinstdir}/program/libbf_svx%{SOPOST}.so
+%{baseinstdir}/program/libbf_wrapper%{SOPOST}.so
+%{baseinstdir}/program/libbf_xo%{SOPOST}.so
+%{baseinstdir}/program/libbib%{SOPOST}.so
+%{baseinstdir}/program/libbindet%{SOPOST}.so
+%{baseinstdir}/program/libcached1.so
+%{baseinstdir}/program/libcanvastools%{SOPOST}.so
+%{baseinstdir}/program/libchart*%{SOPOST}.so
+%{baseinstdir}/program/libcollator_data.so
+%{baseinstdir}/program/libcppcanvas%{SOPOST}.so
+%{baseinstdir}/program/libctl%{SOPOST}.so
+%{baseinstdir}/program/libcui%{SOPOST}.so
+%{baseinstdir}/program/libdba%{SOPOST}.so
+%{baseinstdir}/program/libdbase%{SOPOST}.so
+%{baseinstdir}/program/libdbaxml%{SOPOST}.so
+%{baseinstdir}/program/libdbmm%{SOPOST}.so
+%{baseinstdir}/program/libdbpool2.so
+%{baseinstdir}/program/libdbtools%{SOPOST}.so
+%{baseinstdir}/program/libdbu%{SOPOST}.so
+%{baseinstdir}/program/libdeploymentmisc%{SOPOST}.so
+%{baseinstdir}/program/libdesktop_detector%{SOPOST}.so
+%{baseinstdir}/program/libdict_ja.so
+%{baseinstdir}/program/libdict_zh.so
+%{baseinstdir}/program/libdrawinglayer%{SOPOST}.so
+%{baseinstdir}/program/libediteng%{SOPOST}.so
+%{baseinstdir}/program/libembobj.so
+%{baseinstdir}/program/libemboleobj.so
+%{baseinstdir}/program/libevoab*.so
+%{baseinstdir}/program/libevtatt%{SOPOST}.so
+%{baseinstdir}/program/libegi%{SOPOST}.so
+%{baseinstdir}/program/libeme%{SOPOST}.so
+%{baseinstdir}/program/libepb%{SOPOST}.so
+%{baseinstdir}/program/libepg%{SOPOST}.so
+%{baseinstdir}/program/libepp%{SOPOST}.so
+%{baseinstdir}/program/libeps%{SOPOST}.so
+%{baseinstdir}/program/libept%{SOPOST}.so
+%{baseinstdir}/program/libera%{SOPOST}.so
+%{baseinstdir}/program/libeti%{SOPOST}.so
+%{baseinstdir}/program/libexp%{SOPOST}.so
+%{baseinstdir}/program/libicd%{SOPOST}.so
+%{baseinstdir}/program/libicg%{SOPOST}.so
+%{baseinstdir}/program/libidx%{SOPOST}.so
+%{baseinstdir}/program/libime%{SOPOST}.so
+%{baseinstdir}/program/libindex_data.so
+%{baseinstdir}/program/libipb%{SOPOST}.so
+%{baseinstdir}/program/libipd%{SOPOST}.so
+%{baseinstdir}/program/libips%{SOPOST}.so
+%{baseinstdir}/program/libipt%{SOPOST}.so
+%{baseinstdir}/program/libipx%{SOPOST}.so
+%{baseinstdir}/program/libira%{SOPOST}.so
+%{baseinstdir}/program/libitg%{SOPOST}.so
+%{baseinstdir}/program/libiti%{SOPOST}.so
+%{baseinstdir}/program/libofficebean%{SOPOST}.so
+%{baseinstdir}/program/liboooimprovecore%{SOPOST}.so
+%{baseinstdir}/program/libfile%{SOPOST}.so
+%{baseinstdir}/program/libfilterconfig%{SOPOST}.so
+%{baseinstdir}/program/libflat%{SOPOST}.so
+%{baseinstdir}/program/libfrm%{SOPOST}.so
+%{baseinstdir}/program/libguesslang%{SOPOST}.so
+%{baseinstdir}/program/libhelplinker%{SOPOST}.so
+%{baseinstdir}/program/libhyphen%{SOPOST}.so
+%{baseinstdir}/program/libi18nregexp%{SOPOST}.so
+%{baseinstdir}/program/libjdbc%{SOPOST}.so
+%{baseinstdir}/program/liblegacy_binfilters%{SOPOST}.so
+%{baseinstdir}/program/liblng%{SOPOST}.so
+%{baseinstdir}/program/liblog%{SOPOST}.so
+%{baseinstdir}/program/liblocaledata_en.so
+%{baseinstdir}/program/liblocaledata_es.so
+%{baseinstdir}/program/liblocaledata_euro.so
+%{baseinstdir}/program/liblocaledata_others.so
+%{baseinstdir}/program/libmcnttype.so
+%{baseinstdir}/program/libmozbootstrap.so
+%{baseinstdir}/program/libmsfilter%{SOPOST}.so
+%{baseinstdir}/program/mtfrenderer.uno.so
+%{baseinstdir}/program/libmysql%{SOPOST}.so
+%{baseinstdir}/program/libodbc%{SOPOST}.so
+%{baseinstdir}/program/libodbcbase%{SOPOST}.so
+%{baseinstdir}/program/liboffacc%{SOPOST}.so
+%{baseinstdir}/program/liboox%{SOPOST}.so
+%{baseinstdir}/program/libpcr%{SOPOST}.so
+%{baseinstdir}/program/libpdffilter%{SOPOST}.so
+%{baseinstdir}/program/libpl%{SOPOST}.so
+%{baseinstdir}/program/libprotocolhandler%{SOPOST}.so
+%{baseinstdir}/program/libqstart_gtk%{SOPOST}.so
+%{baseinstdir}/program/librecentfile.so
+%{baseinstdir}/program/libres%{SOPOST}.so
+%{baseinstdir}/program/libsax%{SOPOST}.so
+%{baseinstdir}/program/libscn%{SOPOST}.so
+%{baseinstdir}/program/libscriptframe.so
+%{baseinstdir}/program/libsd%{SOPOST}.so
+%{baseinstdir}/program/libsdfilt%{SOPOST}.so
+%{baseinstdir}/program/libsdbc2.so
+%{baseinstdir}/program/libsdbt%{SOPOST}so
+%{baseinstdir}/program/libsdd%{SOPOST}.so
+%{baseinstdir}/program/libsdui%{SOPOST}.so
+%{baseinstdir}/program/libspa%{SOPOST}.so
+%{baseinstdir}/program/libspell%{SOPOST}.so
+%{baseinstdir}/program/libsrtrs1.so
+%{baseinstdir}/program/libsts%{SOPOST}.so
+%{baseinstdir}/program/libsvx%{SOPOST}.so
+%{baseinstdir}/program/libsvxcore%{SOPOST}.so
+%{baseinstdir}/program/libsw%{SOPOST}.so
+%{baseinstdir}/program/libtextconv_dict.so
+%{baseinstdir}/program/libtextconversiondlgs%{SOPOST}.so
+%{baseinstdir}/program/libtvhlp1.so
+%{baseinstdir}/program/libodfflatxml%{SOPOST}.so
+%{baseinstdir}/program/libucbhelper4gcc3.so
+%{baseinstdir}/program/libucpchelp1.so
+%{baseinstdir}/program/libucpdav1.so
+%{baseinstdir}/program/libucpftp1.so
+%{baseinstdir}/program/libucphier1.so
+%{baseinstdir}/program/libucppkg1.so
+%{baseinstdir}/program/libunordf%{SOPOST}.so
+%{baseinstdir}/program/libunopkgapp.so
+%{baseinstdir}/program/libunoxml%{SOPOST}.so
+%{baseinstdir}/program/libupdchk%{SOPOST}.so
+%{baseinstdir}/program/libuui%{SOPOST}.so
+%{baseinstdir}/program/libvbahelper%{SOPOST}.so
+%{baseinstdir}/program/libvclplug_gen%{SOPOST}.so
+%{baseinstdir}/program/libvclplug_gtk%{SOPOST}.so
+# TODO is this the right package?
+%{baseinstdir}/program/libvisioimport%{SOPOST}.so
- %if 0%{?fedora}
+ %if %{undefined rhel} || 0%{?rhel} >= 7
-%{basisinstdir}/program/libwpgimport%{SOPOST}.so
+%{baseinstdir}/program/libwpgimport%{SOPOST}.so
%endif
-%{basisinstdir}/program/libxmlfa%{SOPOST}.so
-%{basisinstdir}/program/libxmlfd%{SOPOST}.so
-%{basisinstdir}/program/libxmx%{SOPOST}.so
-%{basisinstdir}/program/libxof%{SOPOST}.so
-%{basisinstdir}/program/libxsec_fw.so
-%{basisinstdir}/program/libxsec_xmlsec.so
-%{basisinstdir}/program/libxsltdlg%{SOPOST}.so
-%{basisinstdir}/program/libxsltfilter%{SOPOST}.so
-%{basisinstdir}/program/libxstor.so
-%{basisinstdir}/program/migrationoo2.uno.so
-%{basisinstdir}/program/migrationoo3.uno.so
-%{basisinstdir}/program/msforms.uno.so
-%{basisinstdir}/program/nsplugin
-%{basisinstdir}/program/open-url
-%{basisinstdir}/program/offapi.rdb
-%{basisinstdir}/program/passwordcontainer.uno.so
-%{basisinstdir}/program/pagein
-%{basisinstdir}/program/pagein-common
-%{basisinstdir}/program/plugin
-%{basisinstdir}/program/pluginapp.bin
-%{basisinstdir}/program/productregistration.uno.so
-%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/avmediaen-US.res
-%{basisinstdir}/program/resource/accen-US.res
-%{basisinstdir}/program/resource/basctlen-US.res
-%{basisinstdir}/program/resource/bf_frmen-US.res
-%{basisinstdir}/program/resource/bf_ofaen-US.res
-%{basisinstdir}/program/resource/bf_schen-US.res
-%{basisinstdir}/program/resource/bf_sden-US.res
-%{basisinstdir}/program/resource/bf_svten-US.res
-%{basisinstdir}/program/resource/bf_svxen-US.res
-%{basisinstdir}/program/resource/biben-US.res
-%{basisinstdir}/program/resource/calen-US.res
-%{basisinstdir}/program/resource/chartcontrolleren-US.res
-%{basisinstdir}/program/resource/cuien-US.res
-%{basisinstdir}/program/resource/dbaen-US.res
-%{basisinstdir}/program/resource/dbmmen-US.res
-%{basisinstdir}/program/resource/dbuen-US.res
-%{basisinstdir}/program/resource/dbwen-US.res
-%{basisinstdir}/program/resource/deploymenten-US.res
-%{basisinstdir}/program/resource/deploymentguien-US.res
-%{basisinstdir}/program/resource/dkten-US.res
-%{basisinstdir}/program/resource/editengen-US.res
-%{basisinstdir}/program/resource/epsen-US.res
-%{basisinstdir}/program/resource/euren-US.res
-%{basisinstdir}/program/resource/fps_officeen-US.res
-%{basisinstdir}/program/resource/frmen-US.res
-%{basisinstdir}/program/resource/fween-US.res
-%{basisinstdir}/program/resource/galen-US.res
-%{basisinstdir}/program/resource/impen-US.res
-%{basisinstdir}/program/resource/ofaen-US.res
-%{basisinstdir}/program/resource/pcren-US.res
-%{basisinstdir}/program/resource/pdffilteren-US.res
-%{basisinstdir}/program/resource/preloaden-US.res
-%{basisinstdir}/program/resource/productregistrationen-US.res
-%{basisinstdir}/program/resource/sanen-US.res
-%{basisinstdir}/program/resource/sben-US.res
-%{basisinstdir}/program/resource/sden-US.res
-%{basisinstdir}/program/resource/sfxen-US.res
-%{basisinstdir}/program/resource/spaen-US.res
-%{basisinstdir}/program/resource/sdbten-US.res
-%{basisinstdir}/program/resource/svlen-US.res
-%{basisinstdir}/program/resource/svten-US.res
-%{basisinstdir}/program/resource/svxen-US.res
-%{basisinstdir}/program/resource/swen-US.res
-%{basisinstdir}/program/resource/textconversiondlgsen-US.res
-%{basisinstdir}/program/resource/tken-US.res
-%{basisinstdir}/program/resource/tplen-US.res
-%{basisinstdir}/program/resource/uuien-US.res
-%{basisinstdir}/program/resource/updchken-US.res
-%{basisinstdir}/program/resource/upden-US.res
-%{basisinstdir}/program/resource/vclen-US.res
-%{basisinstdir}/program/resource/wzien-US.res
-%{basisinstdir}/program/resource/xmlsecen-US.res
-%{basisinstdir}/program/resource/xsltdlgen-US.res
-%{basisinstdir}/program/sax.uno.so
-%{basisinstdir}/program/senddoc
-%{basisinstdir}/program/services.rdb
-%{basisinstdir}/program/simplecanvas.uno.so
-%{basisinstdir}/program/slideshow.uno.so
-%{basisinstdir}/program/libsofficeapp.so
-%{basisinstdir}/program/spadmin.bin
-%{basisinstdir}/program/stringresource%{SOPOST}.uno.so
-%{basisinstdir}/program/syssh.uno.so
-%{basisinstdir}/program/ucpexpand1.uno.so
-%{basisinstdir}/program/ucpext.uno.so
-%{basisinstdir}/program/ucptdoc1.uno.so
-%{basisinstdir}/program/unorc
-%{basisinstdir}/program/updatefeed.uno.so
-%{basisinstdir}/ure-link
-%{basisinstdir}/program/uri-encode
-%{basisinstdir}/program/vbaevents%{SOPOST}.uno.so
-%{basisinstdir}/program/vclcanvas.uno.so
-%{basisinstdir}/program/versionrc
-%{basisinstdir}/program/cairocanvas.uno.so
-%dir %{basisinstdir}/share
-%dir %{basisinstdir}/share/Scripts
-%{basisinstdir}/share/Scripts/java
-%{basisinstdir}/share/autotext
-%{basisinstdir}/share/basic
-%dir %{basisinstdir}/share/config
-%{basisinstdir}/share/config/images.zip
-%{basisinstdir}/share/config/images_crystal.zip
-%{basisinstdir}/share/config/images_hicontrast.zip
-%{basisinstdir}/share/config/images_oxygen.zip
-%{basisinstdir}/share/config/images_tango.zip
-%{basisinstdir}/share/config/javasettingsunopkginstall.xml
-%{basisinstdir}/share/config/psetup.xpm
-%{basisinstdir}/share/config/psetupl.xpm
-%dir %{basisinstdir}/share/config/soffice.cfg
-%{basisinstdir}/share/config/soffice.cfg/modules
-%{basisinstdir}/share/config/symbol
-%{basisinstdir}/share/config/webcast
-%{basisinstdir}/share/config/wizard
-%dir %{basisinstdir}/share/dtd
-%{basisinstdir}/share/dtd/officedocument
-%{basisinstdir}/share/gallery
-%dir %{basisinstdir}/share/psprint
-%config %{basisinstdir}/share/psprint/psprint.conf
-%{basisinstdir}/share/psprint/driver
-%dir %{basisinstdir}/share/registry
-%{basisinstdir}/share/registry/binfilter.xcd
-%{basisinstdir}/share/registry/gnome.xcd
-%{basisinstdir}/share/registry/lingucomponent.xcd
-%{basisinstdir}/share/registry/main.xcd
-%{basisinstdir}/share/registry/oo-ad-ldap.xcd.sample
-%{basisinstdir}/share/registry/oo-ldap.xcd.sample
-%{basisinstdir}/share/registry/Langpack-en-US.xcd
-%dir %{basisinstdir}/share/registry/res
-%{basisinstdir}/share/registry/res/fcfg_langpack_en-US.xcd
-%dir %{basisinstdir}/share/samples
-%{basisinstdir}/share/samples/en-US
-%dir %{basisinstdir}/share/template
-%{basisinstdir}/share/template/en-US
-%dir %{basisinstdir}/share/template/common
-%{basisinstdir}/share/template/common/layout
-%{basisinstdir}/share/template/wizard
-%dir %{basisinstdir}/share/wordbook
-%{basisinstdir}/share/wordbook/en-US
-%dir %{basisinstdir}/share/xslt
-%{basisinstdir}/share/xslt/common
-%dir %{basisinstdir}/share/xslt/export
-%{basisinstdir}/share/xslt/export/common
-%{basisinstdir}/share/xslt/export/spreadsheetml
-%{basisinstdir}/share/xslt/export/wordml
-%dir %{basisinstdir}/share/xslt/import
-%{basisinstdir}/share/xslt/import/common
-%{basisinstdir}/share/xslt/import/spreadsheetml
-%{basisinstdir}/share/xslt/import/wordml
-%{basisinstdir}/program/liblnth%{SOPOST}.so
+%{baseinstdir}/program/libxmlfa%{SOPOST}.so
+%{baseinstdir}/program/libxmlfd%{SOPOST}.so
+%{baseinstdir}/program/libxmx%{SOPOST}.so
+%{baseinstdir}/program/libxof%{SOPOST}.so
+%{baseinstdir}/program/libxsec_fw.so
+%{baseinstdir}/program/libxsec_xmlsec.so
+%{baseinstdir}/program/libxsltdlg%{SOPOST}.so
+%{baseinstdir}/program/libxsltfilter%{SOPOST}.so
+%{baseinstdir}/program/libxstor.so
+%{baseinstdir}/program/migrationoo2.uno.so
+%{baseinstdir}/program/migrationoo3.uno.so
+%{baseinstdir}/program/msforms.uno.so
+%{baseinstdir}/program/nsplugin
+%{baseinstdir}/program/open-url
+%{baseinstdir}/program/types/offapi.rdb
+%{baseinstdir}/program/passwordcontainer.uno.so
+%{baseinstdir}/program/pagein-common
+%{baseinstdir}/program/plugin
+%{baseinstdir}/program/pluginapp.bin
+%dir %{baseinstdir}/program/resource
+%{baseinstdir}/program/resource/avmediaen-US.res
+%{baseinstdir}/program/resource/accen-US.res
+%{baseinstdir}/program/resource/basctlen-US.res
+%{baseinstdir}/program/resource/bf_frmen-US.res
+%{baseinstdir}/program/resource/bf_ofaen-US.res
+%{baseinstdir}/program/resource/bf_schen-US.res
+%{baseinstdir}/program/resource/bf_sden-US.res
+%{baseinstdir}/program/resource/bf_svten-US.res
+%{baseinstdir}/program/resource/bf_svxen-US.res
+%{baseinstdir}/program/resource/biben-US.res
+%{baseinstdir}/program/resource/calen-US.res
+%{baseinstdir}/program/resource/chartcontrolleren-US.res
+%{baseinstdir}/program/resource/cuien-US.res
+%{baseinstdir}/program/resource/dbaen-US.res
+%{baseinstdir}/program/resource/dbmmen-US.res
+%{baseinstdir}/program/resource/dbuen-US.res
+%{baseinstdir}/program/resource/dbwen-US.res
+%{baseinstdir}/program/resource/deploymenten-US.res
+%{baseinstdir}/program/resource/deploymentguien-US.res
+%{baseinstdir}/program/resource/dkten-US.res
+%{baseinstdir}/program/resource/editengen-US.res
+%{baseinstdir}/program/resource/epsen-US.res
+%{baseinstdir}/program/resource/euren-US.res
+%{baseinstdir}/program/resource/fps_officeen-US.res
+%{baseinstdir}/program/resource/frmen-US.res
+%{baseinstdir}/program/resource/fween-US.res
+%{baseinstdir}/program/resource/galen-US.res
+%{baseinstdir}/program/resource/impen-US.res
+%{baseinstdir}/program/resource/ofaen-US.res
+%{baseinstdir}/program/resource/pcren-US.res
+%{baseinstdir}/program/resource/pdffilteren-US.res
+%{baseinstdir}/program/resource/sanen-US.res
+%{baseinstdir}/program/resource/sben-US.res
+%{baseinstdir}/program/resource/sden-US.res
+%{baseinstdir}/program/resource/sfxen-US.res
+%{baseinstdir}/program/resource/spaen-US.res
+%{baseinstdir}/program/resource/sdbten-US.res
+%{baseinstdir}/program/resource/svlen-US.res
+%{baseinstdir}/program/resource/svten-US.res
+%{baseinstdir}/program/resource/svxen-US.res
+%{baseinstdir}/program/resource/swen-US.res
+%{baseinstdir}/program/resource/textconversiondlgsen-US.res
+%{baseinstdir}/program/resource/tken-US.res
+%{baseinstdir}/program/resource/tplen-US.res
+%{baseinstdir}/program/resource/uuien-US.res
+%{baseinstdir}/program/resource/updchken-US.res
+%{baseinstdir}/program/resource/upden-US.res
+%{baseinstdir}/program/resource/vclen-US.res
+%{baseinstdir}/program/resource/wzien-US.res
+%{baseinstdir}/program/resource/xmlsecen-US.res
+%{baseinstdir}/program/resource/xsltdlgen-US.res
+%{baseinstdir}/program/senddoc
+%{baseinstdir}/program/services/services.rdb
+%{baseinstdir}/program/simplecanvas.uno.so
+%{baseinstdir}/program/slideshow.uno.so
+%{baseinstdir}/program/libsofficeapp.so
+%{baseinstdir}/program/spadmin.bin
+%{baseinstdir}/program/stringresource.uno.so
+%{baseinstdir}/program/syssh.uno.so
+%{baseinstdir}/program/ucpcmis1.uno.so
+%{baseinstdir}/program/ucpexpand1.uno.so
+%{baseinstdir}/program/ucpext.uno.so
+%{baseinstdir}/program/ucptdoc1.uno.so
+%{baseinstdir}/program/unorc
+%{baseinstdir}/program/updatefeed.uno.so
+%{baseinstdir}/ure-link
+%{baseinstdir}/program/uri-encode
+%{baseinstdir}/program/vbaevents.uno.so
+%{baseinstdir}/program/vclcanvas.uno.so
+%{baseinstdir}/program/versionrc
+%{baseinstdir}/program/cairocanvas.uno.so
+%dir %{baseinstdir}/share
+%dir %{baseinstdir}/share/Scripts
+%{baseinstdir}/share/Scripts/java
+%{baseinstdir}/share/autotext
+%{baseinstdir}/share/basic
+%dir %{baseinstdir}/share/config
+%{baseinstdir}/share/config/images.zip
+%{baseinstdir}/share/config/images_crystal.zip
+%{baseinstdir}/share/config/images_hicontrast.zip
+%{baseinstdir}/share/config/images_oxygen.zip
+%{baseinstdir}/share/config/images_tango.zip
+%{baseinstdir}/share/config/javasettingsunopkginstall.xml
+%{baseinstdir}/share/config/psetup.xpm
+%{baseinstdir}/share/config/psetupl.xpm
+%dir %{baseinstdir}/share/config/soffice.cfg
+%{baseinstdir}/share/config/soffice.cfg/modules
+%{baseinstdir}/share/config/symbol
+%{baseinstdir}/share/config/webcast
+%{baseinstdir}/share/config/wizard
+%dir %{baseinstdir}/share/dtd
+%{baseinstdir}/share/dtd/officedocument
+%{baseinstdir}/share/fingerprint
+%{baseinstdir}/share/gallery
+%dir %{baseinstdir}/share/psprint
+%config %{baseinstdir}/share/psprint/psprint.conf
+%{baseinstdir}/share/psprint/driver
+%dir %{baseinstdir}/share/registry
+%{baseinstdir}/share/registry/binfilter.xcd
+%{baseinstdir}/share/registry/gnome.xcd
+%{baseinstdir}/share/registry/lingucomponent.xcd
+%{baseinstdir}/share/registry/main.xcd
+%{baseinstdir}/share/registry/oo-ad-ldap.xcd.sample
+%{baseinstdir}/share/registry/oo-ldap.xcd.sample
+%{baseinstdir}/share/registry/Langpack-en-US.xcd
+%dir %{baseinstdir}/share/registry/res
+%{baseinstdir}/share/registry/res/fcfg_langpack_en-US.xcd
+%dir %{baseinstdir}/share/samples
+%{baseinstdir}/share/samples/en-US
+%dir %{baseinstdir}/share/template
+%{baseinstdir}/share/template/en-US
+%dir %{baseinstdir}/share/template/common
+%{baseinstdir}/share/template/common/layout
+%{baseinstdir}/share/template/wizard
+%dir %{baseinstdir}/share/wordbook
+%{baseinstdir}/share/wordbook/en-GB.dic
+%{baseinstdir}/share/wordbook/en-US.dic
+%{baseinstdir}/share/wordbook/sl.dic
+%{baseinstdir}/share/wordbook/technical.dic
+%dir %{baseinstdir}/share/xslt
+%{baseinstdir}/share/xslt/common
+%dir %{baseinstdir}/share/xslt/export
+%{baseinstdir}/share/xslt/export/common
+%{baseinstdir}/share/xslt/export/spreadsheetml
+%{baseinstdir}/share/xslt/export/wordml
+%dir %{baseinstdir}/share/xslt/import
+%{baseinstdir}/share/xslt/import/common
+%{baseinstdir}/share/xslt/import/spreadsheetml
+%{baseinstdir}/share/xslt/import/wordml
+%{baseinstdir}/program/liblnth%{SOPOST}.so
%{_bindir}/unopkg
#icons and mime
%{_datadir}/icons/*/*/*/libreoffice*
@@@ -1721,29 -1816,31 +1729,29 @@@ don
%files base
%defattr(-,root,root,-)
-%dir %{basisinstdir}
-%{basisinstdir}/help/en/sdatabase.*
-%dir %{basisinstdir}/program
-%dir %{basisinstdir}/program/classes
-%if %{undefined rhel} || 0%{?rhel} >= 7
-%{basisinstdir}/program/classes/hsqldb.jar
-%endif
-%{basisinstdir}/program/classes/sdbc_hsqldb.jar
-%{basisinstdir}/program/libabp%{SOPOST}.so
-%{basisinstdir}/program/libadabasui%{SOPOST}.so
-%{basisinstdir}/program/libdbp%{SOPOST}.so
-%{basisinstdir}/program/libhsqldb.so
-%{basisinstdir}/program/librpt*%{SOPOST}.so
-%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/abpen-US.res
-%{basisinstdir}/program/resource/adabasuien-US.res
-%{basisinstdir}/program/resource/cnren-US.res
-%{basisinstdir}/program/resource/dbpen-US.res
-%{basisinstdir}/program/resource/rpten-US.res
-%{basisinstdir}/program/resource/rptuien-US.res
-%{basisinstdir}/program/resource/sdbclen-US.res
-%{basisinstdir}/program/resource/sdberren-US.res
-%{basisinstdir}/share/registry/base.xcd
%dir %{baseinstdir}
+%{baseinstdir}/help/en/sdatabase.*
%dir %{baseinstdir}/program
+%dir %{baseinstdir}/program/classes
- %if 0%{?fedora}
++%if %{undefined rhel} || 0%{?rhel} >= 7
+%{baseinstdir}/program/classes/hsqldb.jar
+%endif
+%{baseinstdir}/program/classes/sdbc_hsqldb.jar
+%{baseinstdir}/program/libabp%{SOPOST}.so
+%{baseinstdir}/program/libadabasui%{SOPOST}.so
+%{baseinstdir}/program/libdbp%{SOPOST}.so
+%{baseinstdir}/program/libhsqldb.so
+%{baseinstdir}/program/librpt*%{SOPOST}.so
+%dir %{baseinstdir}/program/resource
+%{baseinstdir}/program/resource/abpen-US.res
+%{baseinstdir}/program/resource/adabasuien-US.res
+%{baseinstdir}/program/resource/cnren-US.res
+%{baseinstdir}/program/resource/dbpen-US.res
+%{baseinstdir}/program/resource/rpten-US.res
+%{baseinstdir}/program/resource/rptuien-US.res
+%{baseinstdir}/program/resource/sdbclen-US.res
+%{baseinstdir}/program/resource/sdberren-US.res
+%{baseinstdir}/share/registry/base.xcd
%{baseinstdir}/program/sbase
%{_datadir}/applications/libreoffice-base.desktop
%{_bindir}/oobase
@@@ -1868,31 -1966,29 +1876,31 @@@ update-desktop-database %{_datadir}/app
%files writer
%defattr(-,root,root,-)
-%dir %{basisinstdir}
-%{basisinstdir}/help/en/swriter.*
-%dir %{basisinstdir}/program
-%{basisinstdir}/program/libbf_sw%{SOPOST}.so
-%{basisinstdir}/program/libhwp.so
-%{basisinstdir}/program/liblwpft%{SOPOST}.so
-%{basisinstdir}/program/libmsword%{SOPOST}.so
-%if %{undefined rhel} || 0%{?rhel} >= 7
-%{basisinstdir}/program/libmsworks%{SOPOST}.so
-%endif
-%{basisinstdir}/program/libswd%{SOPOST}.so
-%{basisinstdir}/program/libswui%{SOPOST}.so
-%{basisinstdir}/program/libt602filter%{SOPOST}.so
-%{basisinstdir}/program/libwpft%{SOPOST}.so
-%{basisinstdir}/program/libwriterfilter%{SOPOST}.so
-%{basisinstdir}/program/vbaswobj.uno.so
-%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/bf_swen-US.res
-%{basisinstdir}/program/resource/t602filteren-US.res
-%{basisinstdir}/share/registry/writer.xcd
-%{basisinstdir}/program/pagein-writer
%dir %{baseinstdir}
+%{baseinstdir}/help/en/swriter.*
%dir %{baseinstdir}/program
+%{baseinstdir}/program/libbf_sw%{SOPOST}.so
+%{baseinstdir}/program/libdoctok%{SOPOST}.so
+%{baseinstdir}/program/libhwp%{SOPOST}.so
+%{baseinstdir}/program/liblwpft%{SOPOST}.so
+%{baseinstdir}/program/libmsword%{SOPOST}.so
- %if 0%{?fedora}
++%if %{undefined rhel} || 0%{?rhel} >= 7
+%{baseinstdir}/program/libmsworks%{SOPOST}.so
+%endif
+%{baseinstdir}/program/libooxml%{SOPOST}.so
+%{baseinstdir}/program/libresourcemodel%{SOPOST}.so
+%{baseinstdir}/program/librtftok%{SOPOST}.so
+%{baseinstdir}/program/libswd%{SOPOST}.so
+%{baseinstdir}/program/libswui%{SOPOST}.so
+%{baseinstdir}/program/libt602filter%{SOPOST}.so
+%{baseinstdir}/program/libwpft%{SOPOST}.so
+%{baseinstdir}/program/libwriterfilter%{SOPOST}.so
+%{baseinstdir}/program/vbaswobj.uno.so
+%dir %{baseinstdir}/program/resource
+%{baseinstdir}/program/resource/bf_swen-US.res
+%{baseinstdir}/program/resource/t602filteren-US.res
+%{baseinstdir}/share/registry/writer.xcd
+%{baseinstdir}/program/pagein-writer
%{baseinstdir}/program/swriter
%{_datadir}/applications/libreoffice-writer.desktop
%{_bindir}/oowriter
@@@ -2034,17 -2133,16 +2042,17 @@@ update-desktop-database %{_datadir}/app
%{python_sitearch}/uno.py*
%{python_sitearch}/unohelper.py*
%{baseinstdir}/share/extensions/script-provider-for-python
-%{basisinstdir}/share/registry/pyuno.xcd
+%{baseinstdir}/share/registry/pyuno.xcd
- %if 0%{?fedora}
+ %if %{undefined rhel}
%files kde
%defattr(-,root,root,-)
-%dir %{basisinstdir}
-%dir %{basisinstdir}/program
-%{basisinstdir}/program/kde4be1.uno.so
-%{basisinstdir}/program/fps_kde4.uno.so
-%{basisinstdir}/program/libvclplug_kde4%{SOPOST}.so
+%dir %{baseinstdir}
+%dir %{baseinstdir}/program
+%{baseinstdir}/program/kde-open-url
+%{baseinstdir}/program/kde4be1.uno.so
+%{baseinstdir}/program/fps_kde4.uno.so
+%{baseinstdir}/program/libvclplug_kde4%{SOPOST}.so
%endif
%changelog
More information about the scm-commits
mailing list