Release 2

[packages/libreoffice.git] / libreoffice.spec
diff --git a/libreoffice.spec b/libreoffice.spec

index 019a13211b787cee8e61fe5aa15fbaa519443b47..b4db0adeafc96e46b4a2b76ed734093144aa8cd7 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,4 +1,7 @@
-# NOTE:
+# TODO:
+# - fix configure arguments (+ compare with FC)
+#
+# NOTE - FIXME FOR 3.4.3 !!!:
  #      - normal build (i686) requires about 27 GB of disk space:
  #              $BUILD_ROOT     7.0 GB
  #              BUILD           18  GB
  #      - normal build (i686) requires about 27 GB of disk space:
  #              $BUILD_ROOT     7.0 GB
  #              BUILD           18  GB
@@ -11,7 +14,7 @@
  %bcond_without kde4            # KDE4 L&F packages
  %bcond_with    mono            # enable compilation of mono bindings
  %bcond_without mozilla         # without mozilla components
  %bcond_without kde4            # KDE4 L&F packages
  %bcond_with    mono            # enable compilation of mono bindings
  %bcond_without mozilla         # without mozilla components
-%bcond_without i18n            # do not create i18n packages
+%bcond_without i18n        # do not create i18n packages (extra build time)
  %bcond_with    ccache          # use ccache to speed up builds
  %bcond_with    icecream        # use icecream to speed up builds
  %bcond_with    msaccess        # with ms access import pieces
  %bcond_with    ccache          # use ccache to speed up builds
  %bcond_with    icecream        # use icecream to speed up builds
  %bcond_with    msaccess        # with ms access import pieces
@@ -38,87 +41,44 @@
  %undefine      with_system_hsqldb
  %endif
  
  %undefine      with_system_hsqldb
  %endif
  
-%define                major_ver               3.4.3
-%define                upd                     330
+%define                major_ver               4.1.0
  
  Summary:       LibreOffice - powerful office suite
  Summary(pl.UTF-8):     LibreOffice - potężny pakiet biurowy
  Name:          libreoffice
  
  Summary:       LibreOffice - powerful office suite
  Summary(pl.UTF-8):     LibreOffice - potężny pakiet biurowy
  Name:          libreoffice
-Version:       %{major_ver}.2
-Release:       0.1
+Version:       %{major_ver}.4
+Release:       2
  License:       GPL/LGPL
  Group:         X11/Applications
  # we use git because released tarballs are buggy too often
  # git clone git://anongit.freedesktop.org/git/libreoffice/build
  # cd build
  # git checkout -b libreoffice-3-3 origin/libreoffice-3-3
  License:       GPL/LGPL
  Group:         X11/Applications
  # we use git because released tarballs are buggy too often
  # git clone git://anongit.freedesktop.org/git/libreoffice/build
  # cd build
  # git checkout -b libreoffice-3-3 origin/libreoffice-3-3
-Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-bootstrap-%{version}.tar.bz2
-# Source0-md5: 465b3be0e30f88e1139c45d2e2217927
-Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-artwork-%{version}.tar.bz2
-# Source1-md5: 7c2e73f1197d169519f86efe422e5df9
-Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-base-%{version}.tar.bz2
-# Source2-md5: 823956297a7e0b7603c585c49bd9fd4e
-Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-writer-%{version}.tar.bz2
-# Source3-md5: da8a40cac4bd9d4f6f326e0e3b1b7e2a
-Source4:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-calc-%{version}.tar.bz2
-# Source4-md5: a1d5af5be5eb522c8a24feacbb0161fa
-Source5:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-components-%{version}.tar.bz2
-# Source5-md5: 8b972e130dfe62eb41d1d71d72de4b76
-Source6:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-extensions-%{version}.tar.bz2
-# Source6-md5: a6b22494e3a65a3b242ecb896aa7ab48
-Source7:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-extras-%{version}.tar.bz2
-# Source7-md5: b7d86f8baee5b31af210cc81785e5676
-Source8:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-filters-%{version}.tar.bz2
-# Source8-md5: de6c062d334daab99cf0592aa3568215
-Source9:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.bz2
-# Source9-md5: df46914d540ef0126cd746d09c68ca2a
-Source10:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-impress-%{version}.tar.bz2
-# Source10-md5:        8f308250c397ddc6fdb1aae13e102927
-Source11:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.bz2
-# Source11-md5:        502e89e7a190c2b955467215f7894af0
-Source12:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-core-%{version}.tar.bz2
-# Source12-md5:        1fd00a0fcfd4a5d1956c3f6a0990d1ce
-Source13:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-extern-%{version}.tar.bz2
-# Source13-md5:        86914ac8bc30ea721b708b2f2faa3111
-Source14:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-extern-sys-%{version}.tar.bz2
-# Source14-md5:        1452229e57ac3c4191e798eac4c0a7e0
-Source15:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-libs-gui-%{version}.tar.bz2
-# Source15-md5:        bb46bdb682689629d432cdbf5f3f42c2
-Source16:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-postprocess-%{version}.tar.bz2
-# Source16-md5:        bec7f633562762debdf810690002e688
-Source17:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-sdk-%{version}.tar.bz2
-# Source17-md5:        87061613efece1c253906a90cd4dc01f
-Source18:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-testing-%{version}.tar.bz2
-# Source18-md5:        308284d7d1d1bd6860d128b26e24390b
-Source19:      http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-ure-%{version}.tar.bz2
-# Source19-md5:        fa8b36365a2b2fb110c44886d7069774
-Source20:       http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-# Source20-md5:        185d60944ea767075d27247c3162b3bc
-Source23:       http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-# Source23-md5:        fdb27bfe2dbe2e7b57ae194d9bf36bab
-Source24:       http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-# Source24-md5:        a7983f859eafb2677d7ff386a023bc40
-Source25:       http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-# Source25-md5:        1f24ab1d39f4a51faf22244c94a6203f
-Source26:       http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-# Source26-md5:        798b2ffdc8bcfe7bca2cf92b62caf685
-Source27:       http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-# Source27-md5:        35c94d2df8893241173de1d16b6034c0
-Source28:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-# Source28-md5:        ada24d37d8d638b3d8a9985e80bc2978
-Source29:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
-# Source29-md5:        18f577b374d60b3c760a3a3350407632
-Source30:       http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-# Source30-md5:        17410483b5b5f267aa18b7e00b65e6e0
-Source31:       http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-# Source31-md5:        b4cae0700aa1c2aef7eb7f345365e6f1
-# patches applied in prep section
-Patch0:                %{name}-build-apply.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=31871
-Patch100:      %{name}-hotfix-with-lang-all.patch
-Patch101:      %{name}-hotfix-kde4.patch
-Patch102:      %{name}-impress-dont-exit-after-pps-autoplay.patch
-Patch103:      %{name}-3.3.2-bison25.diff
+Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
+# Source0-md5: 5311656e1b54eadd4b93f948dfd5e68e
+Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
+# Source1-md5: 2bbe7adab2b9bc0042c72ba60c30acc4
+Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
+# Source2-md5: e2cd3b63e3050771a1330fc98e41a701
+Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
+# Source3-md5: 1f4438828cbcf83c257742482dade3ef
+
+Source20:       http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+# Source20-md5:        0168229624cfac409e766913506961a8
+Source21:      http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+# Source21-md5:        17410483b5b5f267aa18b7e00b65e6e0
+Source22:      http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+# Source22-md5:        1f24ab1d39f4a51faf22244c94a6203f
+Source23:      http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+# Source23-md5:        798b2ffdc8bcfe7bca2cf92b62caf685
+Source24:      http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+# Source24-md5:        35c94d2df8893241173de1d16b6034c0
+Source25:      http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+# Source25-md5:        a7983f859eafb2677d7ff386a023bc40
+
+Patch0:                %{name}-hamcrest.patch
+Patch1:                %{name}-mdds.patch
+Patch2:                %{name}-md5.patch
  URL:           http://www.documentfoundation.org/
  BuildRequires: /usr/bin/getopt
  BuildRequires: GConf2-devel
  URL:           http://www.documentfoundation.org/
  BuildRequires: /usr/bin/getopt
  BuildRequires: GConf2-devel
@@ -131,9 +91,11 @@ BuildRequires:      autoconf >= 2.51
  BuildRequires: automake >= 1:1.9
  BuildRequires: bash
  BuildRequires: bison >= 1.875-4
  BuildRequires: automake >= 1:1.9
  BuildRequires: bash
  BuildRequires: bison >= 1.875-4
+BuildRequires: bluez-libs-devel
  BuildRequires: boost-devel >= 1.35.0
  BuildRequires: cairo-devel >= 1.2.0
  %{?with_ccache:BuildRequires:  ccache}
  BuildRequires: boost-devel >= 1.35.0
  BuildRequires: cairo-devel >= 1.2.0
  %{?with_ccache:BuildRequires:  ccache}
+BuildRequires: clucene-core-devel >= 2.3
  BuildRequires: cppunit-devel >= 1.12.0
  BuildRequires: cups-devel
  BuildRequires: curl-devel >= 7.9.8
  BuildRequires: cppunit-devel >= 1.12.0
  BuildRequires: cups-devel
  BuildRequires: curl-devel >= 7.9.8
@@ -146,9 +108,10 @@ BuildRequires:     freetype-devel >= 2.1
  BuildRequires: glib2-devel >= 2.13.5
  BuildRequires: gperf
  BuildRequires: graphite2-devel
  BuildRequires: glib2-devel >= 2.13.5
  BuildRequires: gperf
  BuildRequires: graphite2-devel
-BuildRequires: gstreamer-devel >= 0.10.0
-BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
+BuildRequires: gstreamer0.10-devel >= 0.10.0
+BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10.0
  BuildRequires: gtk+2-devel >= 2:2.10
  BuildRequires: gtk+2-devel >= 2:2.10
+BuildRequires: harfbuzz-icu-devel
  %{?with_system_hunspell:BuildRequires: hunspell-devel >=1.2.2}
  BuildRequires: hyphen-devel
  %{?with_icecream:BuildRequires:        icecream}
  %{?with_system_hunspell:BuildRequires: hunspell-devel >=1.2.2}
  BuildRequires: hyphen-devel
  %{?with_icecream:BuildRequires:        icecream}
@@ -159,11 +122,19 @@ BuildRequires:    java-commons-httpclient
  BuildRequires: java-commons-lang
  BuildRequires: java-commons-logging
  BuildRequires: java-flow-engine
  BuildRequires: java-commons-lang
  BuildRequires: java-commons-logging
  BuildRequires: java-flow-engine
+BuildRequires: java-hamcrest
  %{?with_system_hsqldb:BuildRequires:   java-hsqldb}
  BuildRequires: java-junit
  BuildRequires: java-lucene
  BuildRequires: java-lucene-contrib
  BuildRequires: java-servletapi
  %{?with_system_hsqldb:BuildRequires:   java-hsqldb}
  BuildRequires: java-junit
  BuildRequires: java-lucene
  BuildRequires: java-lucene-contrib
  BuildRequires: java-servletapi
+BuildRequires: libcmis-devel >= 0.3
+BuildRequires: liblangtag-devel
+BuildRequires: libmspub-devel
+BuildRequires: libmwaw-devel
+BuildRequires: libodfgen-devel
+BuildRequires: liborcus-devel >= 0.4
+BuildRequires: libvisio-devel
  BuildRequires: libwpd-devel >= 0.9.0
  BuildRequires: libwpg-devel >= 0.2.0
  BuildRequires: libwps-devel >= 0.2.0
  BuildRequires: libwpd-devel >= 0.9.0
  BuildRequires: libwpg-devel >= 0.2.0
  BuildRequires: libwps-devel >= 0.2.0
@@ -180,18 +151,20 @@ BuildRequires:    java-libxml
  BuildRequires: java-sac
  BuildRequires: libart_lgpl-devel
  BuildRequires: libbonobo-devel >= 2.0
  BuildRequires: java-sac
  BuildRequires: libart_lgpl-devel
  BuildRequires: libbonobo-devel >= 2.0
+BuildRequires: libcdr-devel >= 0.0.8
  %{?with_system_libhnj:BuildRequires:   libhnj-devel}
  BuildRequires: libicu-devel >= 4.0
  BuildRequires: libjpeg-devel
  %{?with_system_libhnj:BuildRequires:   libhnj-devel}
  BuildRequires: libicu-devel >= 4.0
  BuildRequires: libjpeg-devel
+BuildRequires: librsvg-devel >= 2.14
  BuildRequires: libsndfile-devel
  BuildRequires: libstdc++-devel >= 5:3.2.1
  BuildRequires: libsvg-devel >= 0.1.4
  BuildRequires: libsndfile-devel
  BuildRequires: libstdc++-devel >= 5:3.2.1
  BuildRequires: libsvg-devel >= 0.1.4
-BuildRequires: libtextcat-devel
+BuildRequires: libexttextcat-devel
  BuildRequires: libxml2-devel >= 2.0
  BuildRequires: libxslt-devel
  BuildRequires: libxslt-progs
  %{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
  BuildRequires: libxml2-devel >= 2.0
  BuildRequires: libxslt-devel
  BuildRequires: libxslt-progs
  %{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
-BuildRequires: mdds-devel
+BuildRequires: mdds-devel >= 0.9.0
  %{?with_mono:BuildRequires:    mono-csharp >= 1.2.3}
  %{?with_mono:BuildRequires:    mono-static >= 1.2.3}
  %{?with_system_myspell:BuildRequires:  myspell-devel}
  %{?with_mono:BuildRequires:    mono-csharp >= 1.2.3}
  %{?with_mono:BuildRequires:    mono-static >= 1.2.3}
  %{?with_system_myspell:BuildRequires:  myspell-devel}
@@ -207,14 +180,16 @@ BuildRequires:    perl-Archive-Zip
  BuildRequires: perl-base
  BuildRequires: perl-devel
  BuildRequires: pkgconfig
  BuildRequires: perl-base
  BuildRequires: perl-devel
  BuildRequires: pkgconfig
+BuildRequires: postgresql-devel
+BuildRequires: poppler-cpp-devel >= 0.8.0
  BuildRequires: poppler-devel >= 0.8.0
  BuildRequires: portaudio-devel
  BuildRequires: poppler-devel >= 0.8.0
  BuildRequires: portaudio-devel
-BuildRequires: python >= 2.2
-BuildRequires: python-devel >= 2.2
-BuildRequires: python-modules >= 2.2
-BuildRequires: redland-devel
+BuildRequires: python3 >= 3.3
+BuildRequires: python3-devel >= 3.3
+BuildRequires: python3-modules >= 3.3
+BuildRequires: redland-devel >= 1.0.16
  BuildRequires: rpm-pythonprov
  BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.357
+BuildRequires: rpmbuild(macros) >= 1.660
  BuildRequires: sablotron-devel
  BuildRequires: sane-backends-devel
  BuildRequires: saxon
  BuildRequires: sablotron-devel
  BuildRequires: sane-backends-devel
  BuildRequires: saxon
@@ -224,10 +199,11 @@ BuildRequires:    unixODBC-devel >= 2.2.12-2
  BuildRequires: unzip
  BuildRequires: vigra-devel
  %{?with_system_xalan:BuildRequires:    xalan-j}
  BuildRequires: unzip
  BuildRequires: vigra-devel
  %{?with_system_xalan:BuildRequires:    xalan-j}
+BuildRequires: xorg-font-font-adobe-utopia-type1
  BuildRequires: xorg-lib-libX11-devel
  BuildRequires: xorg-lib-libXaw-devel
  BuildRequires: xorg-lib-libXtst-devel
  BuildRequires: xorg-lib-libX11-devel
  BuildRequires: xorg-lib-libXaw-devel
  BuildRequires: xorg-lib-libXtst-devel
-BuildRequires: zip
+BuildRequires: zip >= 3.0
  BuildRequires: zlib-devel
  %if %{with java}
  BuildRequires: ant >= 1.7.0
  BuildRequires: zlib-devel
  %if %{with java}
  BuildRequires: ant >= 1.7.0
@@ -247,34 +223,32 @@ Requires: %{name}-draw = %{version}-%{release}
  Requires:      %{name}-emailmerge = %{version}-%{release}
  Requires:      %{name}-graphicfilter = %{version}-%{release}
  Requires:      %{name}-impress = %{version}-%{release}
  Requires:      %{name}-emailmerge = %{version}-%{release}
  Requires:      %{name}-graphicfilter = %{version}-%{release}
  Requires:      %{name}-impress = %{version}-%{release}
-%{?with_java:Requires: %{name}-javafilter = %{version}-%{release}}
  Requires:      %{name}-math = %{version}-%{release}
  Requires:      %{name}-pdfimport = %{version}-%{release}
  Requires:      %{name}-math = %{version}-%{release}
  Requires:      %{name}-pdfimport = %{version}-%{release}
+Requires:      %{name}-postgresql = %{version}-%{release}
  Requires:      %{name}-presentation-minimizer = %{version}-%{release}
  Requires:      %{name}-presentation-minimizer = %{version}-%{release}
-Requires:      %{name}-presenter-screen = %{version}-%{release}
  Requires:      %{name}-pyuno = %{version}-%{release}
  Requires:      %{name}-pyuno = %{version}-%{release}
-Requires:      %{name}-report-builder = %{version}-%{release}
-Requires:      %{name}-testtools = %{version}-%{release}
  Requires:      %{name}-web = %{version}-%{release}
  Requires:      %{name}-wiki-publisher = %{version}-%{release}
  Requires:      %{name}-writer = %{version}-%{release}
  Requires:      %{name}-xsltfilter = %{version}-%{release}
  Obsoletes:     openoffice.org
  Requires:      %{name}-web = %{version}-%{release}
  Requires:      %{name}-wiki-publisher = %{version}-%{release}
  Requires:      %{name}-writer = %{version}-%{release}
  Requires:      %{name}-xsltfilter = %{version}-%{release}
  Obsoletes:     openoffice.org
+Obsoletes:     openoffice.org-testtools
+Obsoletes:     libreoffice-testtools
  ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
  BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %define                specflags       -fno-strict-aliasing -O2
  ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
  BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %define                specflags       -fno-strict-aliasing -O2
+%define                filterout_c     -fomit-frame-pointer
+%define                filterout_cpp   -fomit-frame-pointer
+%define                filterout_cxx   -fomit-frame-pointer
  
  # No ELF objects there to strip/chrpath, skips processing:
  # - share/ - 17000 files of 415M
  # - help/ - 6500 files of 1.4G
  # - program/resource/ - 5610 files of 216M
  
  # No ELF objects there to strip/chrpath, skips processing:
  # - share/ - 17000 files of 415M
  # - help/ - 6500 files of 1.4G
  # - program/resource/ - 5610 files of 216M
-%define                _noautostrip    .*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
-%define                _noautochrpath  .*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
-
-%define                basis           basis3.3
-%define                basisdir        %{_libdir}/%{name}/%{basis}
-%define                databasisdir    %{_datadir}/%{name}/%{basis}
+%define                _noautostrip    .*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
+%define                _noautochrpath  .*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
  
  %description
  LibreOffice is an open-source project sponsored by Sun Microsystems
  
  %description
  LibreOffice is an open-source project sponsored by Sun Microsystems
@@ -342,11 +316,13 @@ Summary:  Core modules for LibreOffice
  Summary(pl.UTF-8):     Podstawowe moduły dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Podstawowe moduły dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires(post,postun): shared-mime-info
  Requires:      %{name}-ure = %{version}-%{release}
  # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
  Requires:      cups-lib
  Requires:      fonts-TTF-OpenSymbol
  Requires(post,postun): shared-mime-info
  Requires:      %{name}-ure = %{version}-%{release}
  # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
  Requires:      cups-lib
  Requires:      fonts-TTF-OpenSymbol
+Requires:      hicolor-icon-theme
  %{?with_system_beanshell:Requires:     java-beanshell}
  %{?with_system_hsqldb:Requires:        java-hsqldb}
  Requires:      libstdc++ >= 5:3.2.1
  %{?with_system_beanshell:Requires:     java-beanshell}
  %{?with_system_hsqldb:Requires:        java-hsqldb}
  Requires:      libstdc++ >= 5:3.2.1
@@ -355,7 +331,9 @@ Requires:   saxon
  Requires:      sed
  %{?with_system_xalan:Requires: xalan-j}
  #Suggests:     chkfontpath
  Requires:      sed
  %{?with_system_xalan:Requires: xalan-j}
  #Suggests:     chkfontpath
-Obsoletes:     libreoffice-i18n-gd
+Obsoletes:     libreoffice-binfilter < 4.0.0.0
+Obsoletes:     libreoffice-report-builder < 4.1.0.0
+Obsoletes:     libreoffice-javafilter < 4.1.0.0
  Obsoletes:     libreoffice-i18n-kid
  Obsoletes:     libreoffice-i18n-ky
  Obsoletes:     libreoffice-i18n-ms
  Obsoletes:     libreoffice-i18n-kid
  Obsoletes:     libreoffice-i18n-ky
  Obsoletes:     libreoffice-i18n-ms
@@ -384,12 +362,10 @@ Obsoletes:        openoffice-libs
  Obsoletes:     openoffice.org-core
  Obsoletes:     openoffice.org-dirs
  Obsoletes:     openoffice.org-i18n-bn_BD
  Obsoletes:     openoffice.org-core
  Obsoletes:     openoffice.org-dirs
  Obsoletes:     openoffice.org-i18n-bn_BD
-Obsoletes:     openoffice.org-i18n-bn_IN
  Obsoletes:     openoffice.org-i18n-by
  Obsoletes:     openoffice.org-i18n-fo
  Obsoletes:     openoffice.org-i18n-fo-gtk
  Obsoletes:     openoffice.org-i18n-fo-kde
  Obsoletes:     openoffice.org-i18n-by
  Obsoletes:     openoffice.org-i18n-fo
  Obsoletes:     openoffice.org-i18n-fo-gtk
  Obsoletes:     openoffice.org-i18n-fo-kde
-Obsoletes:     openoffice.org-i18n-gd
  Obsoletes:     openoffice.org-i18n-gu_IN
  Obsoletes:     openoffice.org-i18n-ia
  Obsoletes:     openoffice.org-i18n-ia-gtk
  Obsoletes:     openoffice.org-i18n-gu_IN
  Obsoletes:     openoffice.org-i18n-ia
  Obsoletes:     openoffice.org-i18n-ia-gtk
@@ -464,27 +440,6 @@ The Presentation Minimizer is used to reduce the file size of the
  current presentation. Images will be compressed, and data that is no
  longer needed will be removed.
  
  current presentation. Images will be compressed, and data that is no
  longer needed will be removed.
  
-%package presenter-screen
-Summary:       Presenter Screen for LibreOffice presentations
-Group:         X11/Applications
-Requires:      %{name}-impress = %{version}-%{release}
-
-%description presenter-screen
-The Presenter Screen is used to provides information on a second
-screen, that typically is not visible to the audience when delivering
-a presentation. e.g. slide notes.
-
-%package report-builder
-Summary:       Create database reports from LibreOffice
-Group:         X11/Applications
-Requires:      %{name}-base = %{version}-%{release}
-Requires:      java-commons-logging
-
-%description report-builder
-Creates database reports from LibreOffice databases. The report
-builder can define group and page headers as well as group, page
-footers and calculation fields to accomplish complex database reports.
-
  %package wiki-publisher
  Summary:       Create Wiki articles on MediaWiki servers with LibreOffice
  Group:         X11/Applications
  %package wiki-publisher
  Summary:       Create Wiki articles on MediaWiki servers with LibreOffice
  Group:         X11/Applications
@@ -505,7 +460,9 @@ Summary:    Database frontend for LibreOffice
  Summary(pl.UTF-8):     Frontend do baz danych dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Frontend do baz danych dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
+Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-base
  
  %description base
  Obsoletes:     openoffice.org-base
  
  %description base
@@ -536,7 +493,9 @@ Summary:    Writer module for LibreOffice
  Summary(pl.UTF-8):     Moduł Writer dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Moduł Writer dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
+Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-writer
  
  %description writer
  Obsoletes:     openoffice.org-writer
  
  %description writer
@@ -565,7 +524,9 @@ Summary:    Calc module for LibreOffice
  Summary(pl.UTF-8):     Moduł Calc dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Moduł Calc dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
+Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-calc
  
  %description calc
  Obsoletes:     openoffice.org-calc
  
  %description calc
@@ -579,7 +540,9 @@ Summary:    Draw module for LibreOffice
  Summary(pl.UTF-8):     Moduł Draw dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Moduł Draw dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
+Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-draw
  
  %description draw
  Obsoletes:     openoffice.org-draw
  
  %description draw
@@ -593,8 +556,11 @@ Summary:   Impress module for LibreOffice
  Summary(pl.UTF-8):     Moduł Impress dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Moduł Impress dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
+Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-impress
  Obsoletes:     openoffice.org-impress
+Obsoletes:     libreoffice-presenter-screen < 4.0.0.0-1
  
  %description impress
  Presentation application of LibreOffice.
  
  %description impress
  Presentation application of LibreOffice.
@@ -607,7 +573,9 @@ Summary:    Math module for LibreOffice
  Summary(pl.UTF-8):     Moduł Math dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
  Summary(pl.UTF-8):     Moduł Math dla LibreOffice
  Group:         X11/Applications
  Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
+Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-math
  
  %description math
  Obsoletes:     openoffice.org-math
  
  %description math
@@ -647,33 +615,27 @@ Moduł xsltfilter dla LibreOffice, udostępnia dodatkowe przekształcenia
  wyjściowe dla formatów docbook i xhtml. Jest potrzebny do eksportu do
  docbooka.
  
  wyjściowe dla formatów docbook i xhtml. Jest potrzebny do eksportu do
  docbooka.
  
-%package javafilter
-Summary:       Extra javafilter module for LibreOffice
-Summary(pl.UTF-8):     Dodatkowy moduł javafilter dla LibreOffice
+%package postgresql
+Summary:       PostgreSQL connector for LibreOffice
  Group:         X11/Applications
  Requires:      %{name}-core = %{version}-%{release}
  Group:         X11/Applications
  Requires:      %{name}-core = %{version}-%{release}
-Obsoletes:     openoffice.org-javafilter
+Requires:      postgresql-libs
  
  
-%description javafilter
-javafilter module for LibreOffice, provides additional aportisdoc,
-Pocket Excel and Pocket Word import filters.
+%description postgresql
+A PostgreSQL connector for the database front-end for LibreOffice.
+Allows creation and management of PostgreSQL databases through a GUI.
  
  
-%description javafilter -l pl.UTF-8
-Moduł javafilter dla LibreOffice, udostępnia dodatkowe filtry importu
-aportisdoc, Pocket Excel i Pocket Word.
-
-%package testtools
-Summary:       testtools for LibreOffice
-Summary(pl.UTF-8):     Narzędzia testowe dla LibreOffice
-Group:         Development/Libraries
+%package nlpsolver
+Summary:       Non-linear solver engine for LibreOffice Calc
+Group:         X11/Applications
+Requires:      %{name}-calc = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      %{name}-core = %{version}-%{release}
-Obsoletes:     openoffice.org-testtools
-
-%description testtools
-QA tools for LibreOffice, enables automated testing.
+Requires:      %{name}-ure = %{version}-%{release}
  
  
-%description testtools -l pl.UTF-8
-Narzędzia QA dla LibreOffice, pozwalają na automatyczne testowanie.
+%description nlpsolver
+A non-linear solver engine for Calc as an alternative to the default
+linear programming model when more complex, nonlinear programming is
+required.
  
  # FIXME
  %package ure
  
  # FIXME
  %package ure
@@ -728,6 +690,20 @@ Afrikaans language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  afrykanerskim.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  afrykanerskim.
  
+%package i18n-am
+Summary:       LibreOffice - interface in Amharic language
+Summary(pl.UTF-8):     LibreOffice - interfejs w języku amharskim
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+
+%description i18n-am
+This package provides resources containing menus and dialogs in
+Amharic language.
+
+%description i18n-am -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+amharskim.
+
  %package i18n-ar
  Summary:       LibreOffice - interface in Arabic language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku arabskim
  %package i18n-ar
  Summary:       LibreOffice - interface in Arabic language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku arabskim
@@ -811,6 +787,21 @@ Bulgarian language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  bułgarskim.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  bułgarskim.
  
+%package i18n-bn_IN
+Summary:       LibreOffice - interface in Indian Bangla language
+Summary(pl.UTF-8):     LibreOffice - interfejs w języku indyjskim bengalskim
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+Obsoletes:     openoffice.org-i18n-bn_IN
+
+%description i18n-bn_IN
+This package provides resources containing menus and dialogs in Indian
+Bangla language.
+
+%description i18n-bn_IN -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+indyjskim bengalskim.
+
  %package i18n-bn
  Summary:       LibreOffice - interface in Bangla language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku bengalskim
  %package i18n-bn
  Summary:       LibreOffice - interface in Bangla language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku bengalskim
@@ -1220,6 +1211,20 @@ language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  irlandzkim.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  irlandzkim.
  
+%package i18n-gd
+Summary:       LibreOffice - interface in Scottish Gaelic language
+Summary(pl.UTF-8):     LibreOffice - interfejs w języku gaelickim szkockim
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+
+%description i18n-gd
+This package provides resources containing menus and dialogs in
+Scottish Gaelic language.
+
+%description i18n-gd -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+gaelicki szkocki.
+
  %package i18n-gl
  Summary:       LibreOffice - interface in Galician language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku galicyjskim
  %package i18n-gl
  Summary:       LibreOffice - interface in Galician language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku galicyjskim
@@ -1524,6 +1529,21 @@ Kurdish language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  kurdyjskim.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  kurdyjskim.
  
+%package i18n-lb
+Summary:       LibreOffice - interface in Luxembourgish language
+Summary(pl.UTF-8):     LibreOffice - interfejs w języku luksemburgskim
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+Obsoletes:     openoffice.org-i18n-lb
+
+%description i18n-lb
+This package provides resources containing menus and dialogs in
+Luxembourgish language.
+
+%description i18n-lb -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+luksemburgskim.
+
  %package i18n-lo
  Summary:       LibreOffice - interface in Lao language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku laotańskim
  %package i18n-lo
  Summary:       LibreOffice - interface in Lao language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku laotańskim
@@ -1901,6 +1921,21 @@ Brazilian Portuguese language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  portugalskim dla Brazylii.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  portugalskim dla Brazylii.
  
+%package i18n-qtz
+Summary:       LibreOffice - interface in "KeyID language" pseudo-locale
+Summary(pl.UTF-8):     LibreOffice - interfejs w pseudo-lokalizacji "KeyID"
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+Obsoletes:     openoffice.org-i18n-qtz
+
+%description i18n-qtz
+The "KeyID language" is a pseudo-locale that is available in
+LibreOffice. It shows all KeyID's in the UI itself.
+
+%description i18n-qtz -l pl.UTF-8
+"Język KeyID" jest pseudo-lokalizacją dostępną w LibreOffice.
+Pokazuje wszystkie wartości KeyID w interfejsie programu.
+
  %package i18n-ro
  Summary:       LibreOffice - interface in Romanian language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku rumuńskim
  %package i18n-ro
  Summary:       LibreOffice - interface in Romanian language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku rumuńskim
@@ -2025,6 +2060,20 @@ Sinhala language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  syngaleskim.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  syngaleskim.
  
+%package i18n-sid
+Summary:       LibreOffice - interface in Sidama language
+Summary(pl.UTF-8):     LibreOffice - interfejs w języku sidamo
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+
+%description i18n-sid
+This package provides resources containing menus and dialogs in
+Sidama language.
+
+%description i18n-sid -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+sidamo.
+
  %package i18n-sk
  Summary:       LibreOffice - interface in Slovak language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku słowackim
  %package i18n-sk
  Summary:       LibreOffice - interface in Slovak language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku słowackim
@@ -2271,6 +2320,21 @@ language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  tsonga.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  tsonga.
  
+%package i18n-tt
+Summary:       LibreOffice - interface in Tatar language
+Summary(pl.UTF-8):     LibreOffice - interfejs w języku tatarskim
+Group:         I18n
+Requires:      %{name}-core = %{version}-%{release}
+Obsoletes:     openoffice.org-i18n-tt
+
+%description i18n-tt
+This package provides resources containing menus and dialogs in Tatar
+language.
+
+%description i18n-tt -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+tatarskim.
+
  %package i18n-ug
  Summary:       LibreOffice - interface in Uyghur language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku ujgurskim
  %package i18n-ug
  Summary:       LibreOffice - interface in Uyghur language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku ujgurskim
@@ -2437,24 +2501,37 @@ bash-completion for LibreOffice.
  %description -n bash-completion-%{name} -l pl.UTF-8
  bashowe uzupełnianie nazw dla LibreOffice.
  
  %description -n bash-completion-%{name} -l pl.UTF-8
  bashowe uzupełnianie nazw dla LibreOffice.
  
+%package glade
+Summary:       Support for creating LibreOffice dialogs in glade
+Group:         Development/Libraries
+Requires:      %{name}-core = %{version}-%{release}
+Requires:      libgladeui
+
+%description glade
+libreoffice-glade contains a catalog of LibreOffice-specific widgets
+for glade and ui-previewer tool to check the visual appearance of
+dialogs.
+
  %prep
  %prep
-%setup -q -n %{name}-bootstrap-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19
+%setup -q -n %{name}-%{version} -a1 -a2 -a3
+
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+
  for dir in *-%{version}; do
         [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
  for dir in *-%{version}; do
         [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
+       rm -rf $dir/git-hooks
         mv $dir/* .
  done
  
  install -d ext_sources
  ln %{SOURCE20} ext_sources
         mv $dir/* .
  done
  
  install -d ext_sources
  ln %{SOURCE20} ext_sources
+ln %{SOURCE21} ext_sources
+ln %{SOURCE22} ext_sources
  ln %{SOURCE23} ext_sources
  ln %{SOURCE24} ext_sources
  ln %{SOURCE25} ext_sources
  ln %{SOURCE23} ext_sources
  ln %{SOURCE24} ext_sources
  ln %{SOURCE25} ext_sources
-ln %{SOURCE26} ext_sources
-ln %{SOURCE27} ext_sources
-ln %{SOURCE28} ext_sources
-ln %{SOURCE29} ext_sources
-ln %{SOURCE30} ext_sources
-ln %{SOURCE31} ext_sources
  :> src.downloaded
  
  %build
  :> src.downloaded
  
  %build
@@ -2468,7 +2545,7 @@ fi
  SAFE_CFLAGS=""
  for i in %{rpmcflags}; do
         case "$i" in
  SAFE_CFLAGS=""
  for i in %{rpmcflags}; do
         case "$i" in
-       -O?|-pipe|-Wall|-g|-fexceptions)
+       -O?|-pipe|-Wall|-g|-fexceptions|-fomit-frame-pointer)
                 ;;
         *)
                 SAFE_CFLAGS="$SAFE_CFLAGS $i"
                 ;;
         *)
                 SAFE_CFLAGS="$SAFE_CFLAGS $i"
@@ -2480,13 +2557,9 @@ export CC="%{__cc}"
  export CXX="%{__cxx}"
  export CPP="%{__cpp}"
  
  export CXX="%{__cxx}"
  export CPP="%{__cpp}"
  
-%{__aclocal}
-%{__autoconf}
-
-export DESTDIR=$RPM_BUILD_ROOT
  export IGNORE_MANIFEST_CHANGES=1
  export IGNORE_MANIFEST_CHANGES=1
-export QTINC="%{_includedir}/qt"
-export QTLIB="%{_libdir}"
+export QT4INC="%{_includedir}/qt4"
+export QT4LIB="%{_libdir}"
  export QT4DIR="%{_libdir}/qt4"
  
  %if %{with java}
  export QT4DIR="%{_libdir}/qt4"
  
  %if %{with java}
@@ -2501,7 +2574,6 @@ if [ "$CCACHE_DIR" = "" ] ; then
  fi
  %endif
  
  fi
  %endif
  
-
  %if %{with parallelbuild}
  RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
  [ -z "$RPM_BUILD_NR_THREADS" ] && RPM_BUILD_NR_THREADS=1
  %if %{with parallelbuild}
  RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
  [ -z "$RPM_BUILD_NR_THREADS" ] && RPM_BUILD_NR_THREADS=1
@@ -2509,8 +2581,13 @@ RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
  RPM_BUILD_NR_THREADS="1"
  %endif
  
  RPM_BUILD_NR_THREADS="1"
  %endif
  
+%{__aclocal} -I m4
+%{__autoconf}
+touch autogen.lastrun
+
  %configure \
  %configure \
-       --with-num-cpus=$RPM_BUILD_NR_THREADS \
+       --enable-release-build \
+       --with-parallelism=$RPM_BUILD_NR_THREADS \
         --with-max-jobs=1 \
         --with-unix-wrapper=%{name} \
         --disable-odk \
         --with-max-jobs=1 \
         --with-unix-wrapper=%{name} \
         --disable-odk \
@@ -2552,19 +2629,20 @@ RPM_BUILD_NR_THREADS="1"
         --with-system-vigra \
         --with-system-xrender-headers=yes \
         --with-system-zlib \
         --with-system-vigra \
         --with-system-xrender-headers=yes \
         --with-system-zlib \
-       --with-system-libtextcat \
-       --with-external-libtextcat-data \
+       --with-system-libexttextcat \
         --with-system-jfreereport \
         --with-system-jfreereport \
+       --enable-vba \
         --with-vba-package-format="builtin" \
         --with-system-libs \
         --with-system-headers \
         --with-system-mythes \
         --with-vba-package-format="builtin" \
         --with-system-libs \
         --with-system-headers \
         --with-system-mythes \
-       --with-system-dicts \
         --with-system-apache-commons \
         --with-system-apache-commons \
+       --with-junit=%{_datadir}/java/junit.jar \
         --without-system-saxon \
         --without-system-saxon \
-       --without-system-translate-toolkit \
+       --without-system-sampleicc \
         --enable-ext-presenter-minimizer \
         --enable-ext-presenter-console \
         --enable-ext-presenter-minimizer \
         --enable-ext-presenter-console \
+       --enable-ext-nlpsolver \
         --enable-ext-pdfimport \
         --enable-ext-wiki-publisher \
         --enable-ext-report-builder \
         --enable-ext-pdfimport \
         --enable-ext-wiki-publisher \
         --enable-ext-report-builder \
@@ -2625,25 +2703,11 @@ RPM_BUILD_NR_THREADS="1"
         ARCH_FLAGS_CXX="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" \
         ARCH_FLAGS_OPT="$SAFE_CFLAGS"
  
         ARCH_FLAGS_CXX="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" \
         ARCH_FLAGS_OPT="$SAFE_CFLAGS"
  
-# hack for parallel build
-if [ $RPM_BUILD_NR_THREADS -gt 1 ]; then
-       doit=1
-       while [ "$doit" -eq 1 ]; do
-               echo "Waiting one more time..."
-               FCH=$(nice -n 20 find . -type f ! -mmin +3 -print 2> /dev/null | wc -l)
-               [ "$FCH" -eq 0 ] && doit=0 || sleep 30
-       done
-fi
-
  %install
  %install
+# install just once (based on makeinstall.stamp)
+# this will make packaging newer versions simplier
  if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
  if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
-       rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
-
-       # clean file listings
-       rm -f build/*_list.txt
-
-       # limit to single process installation, it's safe at least
-       %{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
+       %{__rm} -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
  
         export QTINC="%{_includedir}/qt"
         export QTLIB="%{_libdir}"
  
         export QTINC="%{_includedir}/qt"
         export QTLIB="%{_libdir}"
@@ -2654,74 +2718,47 @@ if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
         export TEMP="%{tmpdir}"
         export DEFAULT_TO_ENGLISH_FOR_PACKING=1
  
         export TEMP="%{tmpdir}"
         export DEFAULT_TO_ENGLISH_FOR_PACKING=1
  
-       %{__make} install \
+       %{__make} distro-pack-install \
                 DESTDIR=$RPM_BUILD_ROOT
  
                 DESTDIR=$RPM_BUILD_ROOT
  
-       cd build/%{name}-%{version}
-
-       # unpack report-builder extension
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/report-builder
-       unzip solver/%{upd}/unxlng*/bin/report-builder.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/report-builder
-
-       # unpack wiki-publisher extension
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/wiki-publisher
-       unzip solver/%{upd}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/wiki-publisher
-
-       # unpack presentation-minimizer extension
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presentation-minimizer
-       unzip solver/%{upd}/unxlng*/bin/minimizer/presentation-minimizer.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presentation-minimizer
-
-       # unpack presenter screen extension
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presenter-screen
-       unzip solver/%{upd}/unxlng*/bin/presenter/presenter-screen.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/presenter-screen
-
-       # unpack pdfimport extension
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/pdfimport
-       unzip solver/%{upd}/unxlng*/bin/pdfimport/pdfimport.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/pdfimport
-
-       cd ../..
-
         # save orignal install layout
         find $RPM_BUILD_ROOT -ls > ls.txt
         touch makeinstall.stamp
  fi
  
         # save orignal install layout
         find $RPM_BUILD_ROOT -ls > ls.txt
         touch makeinstall.stamp
  fi
  
+# mangle files installed in build root
  if [ ! -f installed.stamp ]; then
         chmod -Rf a+rX,u+w,g-w,o-w $RPM_BUILD_ROOT
  
  if [ ! -f installed.stamp ]; then
         chmod -Rf a+rX,u+w,g-w,o-w $RPM_BUILD_ROOT
  
-       # do we need those? large comparing to png
-       rm -r $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/*.svg
-
-       rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
-
         %if %{with mono}
         %if %{with mono}
-       rm $RPM_BUILD_ROOT%{_pkgconfigdir}/mono-ooo-2.1.pc
+       %{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/mono-ooo-2.1.pc
         %endif
  
         %if %{with mozilla}
         install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
         %endif
  
         %if %{with mozilla}
         install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
-       ln -s %{basisdir}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+       ln -s %{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
         %endif
  
         perl -pi -e 's/^[       ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
         %endif
  
         perl -pi -e 's/^[       ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
-               $RPM_BUILD_ROOT%{basisdir}/program/setup
+               $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup
  
  
-       chmod +x $RPM_BUILD_ROOT%{basisdir}/program/*.so
+       chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
  
  
-       install -d $RPM_BUILD_ROOT%{databasisdir}
+       install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
         # put share to %{_datadir} so we're able to produce noarch packages
         # put share to %{_datadir} so we're able to produce noarch packages
-       mv $RPM_BUILD_ROOT%{basisdir}/help $RPM_BUILD_ROOT/%{databasisdir}
-       ln -s ../../../share/%{name}/%{basis}/help $RPM_BUILD_ROOT%{basisdir}/help
+       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT/%{_datadir}/%{name}
+       ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
         mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
         ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
  
         mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
         ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
  
-       # Rename .desktop files to avoid conflicts with other applications .desktops
-       # TODO: make patch instead.
-       for a in $RPM_BUILD_ROOT%{_desktopdir}/*.desktop; do
-               d=$(dirname "$a")
-               f=$(basename "$a")
-               mv $a $d/lo$f
+       %{__rm} -r $RPM_BUILD_ROOT%{_desktopdir}/*.desktop \
+               $RPM_BUILD_ROOT%{_iconsdir}/{gnome,locolor} \
+               $RPM_BUILD_ROOT%{_datadir}/application-registry \
+               $RPM_BUILD_ROOT%{_datadir}/mime{lnk,-info}
+       for a in $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg/*.desktop; do
+               cp $a $RPM_BUILD_ROOT%{_desktopdir}/libreoffice-$(basename "$a")
         done
         done
+       %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
  
         # Make oo* -> lo* symlinks for compatibility with misc software,
         # for example mailcap
  
         # Make oo* -> lo* symlinks for compatibility with misc software,
         # for example mailcap
@@ -2740,11 +2777,11 @@ find_lang() {
         echo "%%defattr(644,root,root,755)" > ${langfn}.lang
  
         # help files
         echo "%%defattr(644,root,root,755)" > ${langfn}.lang
  
         # help files
-       if [ -f build/help_${langfn}_list.txt ]; then
-               cat build/help_${langfn}_list.txt >> ${langfn}.lang
+       if [ -f file-lists/help_${langfn}_list.txt ]; then
+               cat file-lists/help_${langfn}_list.txt >> ${langfn}.lang
         fi
  
         fi
  
-       lfile="build/lang_${langfn}_list.txt"
+       lfile="file-lists/lang_${langfn}_list.txt"
         if [ -f ${lfile} ]; then
                 lprefix=$(bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || :)
                 longlang=$(bin/openoffice-xlate-lang -l ${lang} 2>/dev/null || :)
         if [ -f ${lfile} ]; then
                 lprefix=$(bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || :)
                 longlang=$(bin/openoffice-xlate-lang -l ${lang} 2>/dev/null || :)
@@ -2777,30 +2814,45 @@ find_lang() {
                 # lib/openoffice.org/share/autotext/$lang
                 grep "/share/autotext/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/autotext/${lang}/" ${lfile} >> ${langfn}.lang || :
                 # lib/openoffice.org/share/autotext/$lang
                 grep "/share/autotext/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/autotext/${lang}/" ${lfile} >> ${langfn}.lang || :
-               # %{basisdir}/share/registry/.*[_-]$lang.xcd
+               # %{_libdir}/%{name}/share/registry/.*[_-]$lang.xcd
                 grep "/share/registry/.*[_-]${lang}.xcd$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/registry/.*[_-]${lang}.xcd$" ${lfile} >> ${langfn}.lang || :
-               # %{basisdir}/share/template/$lang
+               # %{_libdir}/%{name}/share/template/$lang
                 grep "/share/template/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/template/${lang}/" ${lfile} >> ${langfn}.lang || :
                 grep "/share/template/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/template/${lang}/" ${lfile} >> ${langfn}.lang || :
-               # %{basisdir}/share/template/wizard/letter/lang
+               # %{_libdir}/%{name}/share/template/wizard/letter/lang
                 grep "/share/template/wizard/letter/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/template/wizard/letter/${lang}$" ${lfile} >> ${langfn}.lang || :
-               grep "/share/template/wizard/letter/${lang}$" build/common_list.txt >> ${langfn}.lang || :
+               grep "/share/template/wizard/letter/${lang}$" file-lists/common_list.txt >> ${langfn}.lang || :
                 grep "/share/template/wizard/letter/${lang}/" ${lfile} >> ${langfn}.lang || :
                 grep "/share/template/wizard/letter/${lang}/" ${lfile} >> ${langfn}.lang || :
-               grep "/share/template/wizard/letter/${lang}/" build/common_list.txt >> ${langfn}.lang || :
-               # %{basisdir}/share/wordbook/$lang
+               grep "/share/template/wizard/letter/${lang}/" file-lists/common_list.txt >> ${langfn}.lang || :
+               # %{_libdir}/%{name}/share/wordbook/$lang
                 grep "/share/wordbook/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/wordbook/${lang}/" ${lfile} >> ${langfn}.lang || :
                 grep "/share/wordbook/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/wordbook/${lang}/" ${lfile} >> ${langfn}.lang || :
-               # %{basisdir}/share/samples/$lang
+               # %{_libdir}/%{name}/share/samples/$lang
                 grep "/share/samples/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/samples/${lang}/" ${lfile} >> ${langfn}.lang || :
                 grep "/share/samples/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/share/samples/${lang}/" ${lfile} >> ${langfn}.lang || :
-               # %{basisdir}/help/$lang
+               # %{_libdir}/%{name}/help/$lang
                 grep "/help/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/help/${lang}/" ${lfile} >> ${langfn}.lang || :
                 grep "/help/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/help/${lang}/" ${lfile} >> ${langfn}.lang || :
+               # UI translations
+               grep "/soffice.cfg/[^/]*/ui/res/${lang}$" ${lfile} >> ${langfn}.lang || :
+               grep "/soffice.cfg/[^/]*/ui/res/${lang}/" ${lfile} >> ${langfn}.lang || :
+               grep "/soffice.cfg/modules/[^/]*/ui/res/${lang}$" ${lfile} >> ${langfn}.lang || :
+               grep "/soffice.cfg/modules/[^/]*/ui/res/${lang}/" ${lfile} >> ${langfn}.lang || :
+
+               for e in presentation-minimizer \
+                               script-provider-for-python \
+                               wiki-publisher \
+                               nlpsolver ; do
+                       for d in $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/$e/description-${lang}.txt ; do
+                               [ -f $d ] && echo "%lang(${lang}) $d" | sed -e "s|$RPM_BUILD_ROOT||g" >> $e.lang || :
+                       done
+               done
         fi
  }
  
         fi
  }
  
-rm -f *.lang*
-langlist=$(ls build/lang_*_list.txt | sed -e 's=build/lang_\(.*\)_list.txt=\1=g')
+%if %{with i18n}
+%{__rm} -f *.lang*
+langlist=$(ls file-lists/lang_*_list.txt | sed -e 's=file-lists/lang_\(.*\)_list.txt=\1=g')
  
  for lang in $langlist; do
         find_lang $lang
  
  for lang in $langlist; do
         find_lang $lang
@@ -2808,8 +2860,21 @@ done
  
  %{__sed} -i -e '
         s,%{_libdir}/%{name}/readmes,%{_datadir}/%{name}/readmes,;
  
  %{__sed} -i -e '
         s,%{_libdir}/%{name}/readmes,%{_datadir}/%{name}/readmes,;
-       s,%{basisdir}/help,%{databasisdir}/help,;
+       s,%{_libdir}/%{name}/help,%{_datadir}/%{name}/help,;
  ' *.lang
  ' *.lang
+%endif
+
+# Fix incorrect file list, help files listed but not installed
+for l in lb bn_IN; do
+       %{__sed} -i -e '/.*\/help\/.*/d' $l.lang
+done
+
+## Remove unsupported locale files to avoid confusion about unpackaged files
+#for l in ???; do
+#      for f in `cat file-lists/lang_${l}_list.txt` ; do
+#              %{__rm} -f $RPM_BUILD_ROOT/$f
+#      done
+#done
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %clean
  rm -rf $RPM_BUILD_ROOT
@@ -2817,16 +2882,20 @@ rm -rf $RPM_BUILD_ROOT
  %post core
  %update_mime_database
  %update_desktop_database_post
  %post core
  %update_mime_database
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun core
  %update_desktop_database_postun
  %update_mime_database
  
  %postun core
  %update_desktop_database_postun
  %update_mime_database
+%update_icon_cache hicolor
  
  %post base
  %update_desktop_database_post
  
  %post base
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun base
  %update_desktop_database_postun
  
  %postun base
  %update_desktop_database_postun
+%update_icon_cache hicolor
  
  %post web
  %update_desktop_database_post
  
  %post web
  %update_desktop_database_post
@@ -2836,33 +2905,43 @@ rm -rf $RPM_BUILD_ROOT
  
  %post writer
  %update_desktop_database_post
  
  %post writer
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun writer
  %update_desktop_database_postun
  
  %postun writer
  %update_desktop_database_postun
+%update_icon_cache hicolor
  
  %post calc
  %update_desktop_database_post
  
  %post calc
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun calc
  %update_desktop_database_postun
  
  %postun calc
  %update_desktop_database_postun
+%update_icon_cache hicolor
  
  %post draw
  %update_desktop_database_post
  
  %post draw
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun draw
  %update_desktop_database_postun
  
  %postun draw
  %update_desktop_database_postun
+%update_icon_cache hicolor
  
  %post impress
  %update_desktop_database_post
  
  %post impress
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun impress
  %update_desktop_database_postun
  
  %postun impress
  %update_desktop_database_postun
+%update_icon_cache hicolor
  
  %post math
  %update_desktop_database_post
  
  %post math
  %update_desktop_database_post
+%update_icon_cache hicolor
  
  %postun math
  %update_desktop_database_postun
  
  %postun math
  %update_desktop_database_postun
+%update_icon_cache hicolor
  
  %post -n browser-plugin-%{name}
  %update_browser_plugins
  
  %post -n browser-plugin-%{name}
  %update_browser_plugins
@@ -2873,7 +2952,7 @@ if [ "$1" = 0 ]; then
  fi
  
  # NOTE:
  fi
  
  # NOTE:
-# you may find build/*_list.txt useful to help you package files to packages
+# you may find file-lists/*_list.txt useful to help you package files to packages
  
  %files
  %defattr(644,root,root,755)
  
  %files
  %defattr(644,root,root,755)
@@ -2882,509 +2961,497 @@ fi
  %defattr(644,root,root,755)
  %doc %{_libdir}/%{name}/CREDITS*
  %doc %{_libdir}/%{name}/LICENSE*
  %defattr(644,root,root,755)
  %doc %{_libdir}/%{name}/CREDITS*
  %doc %{_libdir}/%{name}/LICENSE*
-%doc %{_libdir}/%{name}/*README*
+#%doc %{_libdir}/%{name}/*README*
  
  
-%attr(755,root,root) %{_bindir}/ooconfig
  %attr(755,root,root) %{_bindir}/libreoffice
  %attr(755,root,root) %{_bindir}/lofromtemplate
  %attr(755,root,root) %{_bindir}/libreoffice
  %attr(755,root,root) %{_bindir}/lofromtemplate
+%attr(755,root,root) %{_bindir}/loffice
  %attr(755,root,root) %{_bindir}/ooffice
  %attr(755,root,root) %{_bindir}/oofromtemplate
  %attr(755,root,root) %{_bindir}/ooffice
  %attr(755,root,root) %{_bindir}/oofromtemplate
-%attr(755,root,root) %{_bindir}/ootool
  %attr(755,root,root) %{_bindir}/soffice
  %attr(755,root,root) %{_bindir}/unopkg
  
  %attr(755,root,root) %{_bindir}/soffice
  %attr(755,root,root) %{_bindir}/unopkg
  
-%dir %{basisdir}
-%dir %{databasisdir}
-%dir %{databasisdir}/help
-%{databasisdir}/help/*.xsl
-%dir %{databasisdir}/help/en
-%{databasisdir}/help/en/*.html
-%{databasisdir}/help/en/*.css
-%{databasisdir}/help/en/sbasic.*
-%{databasisdir}/help/en/schart.*
-%{databasisdir}/help/en/shared.*
-
-%dir %{basisdir}/presets
-%dir %{basisdir}/presets/autotext
-%{basisdir}/presets/autotext/mytexts.bau
-%{basisdir}/presets/basic
-%dir %{basisdir}/presets/config
-%{basisdir}/presets/config/*_en-US.so*
-%{basisdir}/presets/config/autotbl.fmt
-%{basisdir}/presets/config/cmyk.soc
-%{basisdir}/presets/config/gallery.soc
-%{basisdir}/presets/config/html.soc
-%{basisdir}/presets/config/libreoffice.soc
-%{basisdir}/presets/config/scribus.soc
-%{basisdir}/presets/config/standard.so?
-%{basisdir}/presets/config/tango.soc
-%{basisdir}/presets/config/web.soc
-%{basisdir}/presets/database
-%{basisdir}/presets/gallery
-%{basisdir}/presets/psprint
-
-%dir %{basisdir}/program
-%attr(755,root,root) %{basisdir}/program/basprov*.uno.so
-%attr(755,root,root) %{basisdir}/program/cairocanvas.uno.so
-%attr(755,root,root) %{basisdir}/program/canvasfactory.uno.so
-%attr(755,root,root) %{basisdir}/program/cde-open-url
-%attr(755,root,root) %{basisdir}/program/cmdmail.uno.so
-%attr(755,root,root) %{basisdir}/program/configmgr.uno.so
-%attr(755,root,root) %{basisdir}/program/deployment*.uno.so
-%attr(755,root,root) %{basisdir}/program/desktopbe1.uno.so
-%attr(755,root,root) %{basisdir}/program/dlgprov*.uno.so
-%attr(755,root,root) %{basisdir}/program/fastsax.uno.so
-%attr(755,root,root) %{basisdir}/program/fpicker.uno.so
-%attr(755,root,root) %{basisdir}/program/fps_office.uno.so
-%attr(755,root,root) %{basisdir}/program/fsstorage.uno.so
-%attr(755,root,root) %{basisdir}/program/gengal
-%attr(755,root,root) %{basisdir}/program/gengal.bin
-%attr(755,root,root) %{basisdir}/program/hatchwindowfactory.uno.so
-%attr(755,root,root) %{basisdir}/program/i18npool.uno.so
-%attr(755,root,root) %{basisdir}/program/i18nsearch.uno.so
-%attr(755,root,root) %{basisdir}/program/java-set-classpath
-%attr(755,root,root) %{basisdir}/program/ldapbe2.uno.so
-%attr(755,root,root) %{basisdir}/program/libaccl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libadabasl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libavmediagst.so
-%attr(755,root,root) %{basisdir}/program/libavmedial[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbasctll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbasebmpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbasegfxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_frml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_gol[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_migratefilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_ofal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_sbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_schl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_scl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_sdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_sml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_sol[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_swl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_svtl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_svxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_wrapperl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbf_xol[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbibl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libbindetl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcached1.so
-%attr(755,root,root) %{basisdir}/program/libcanvastoolsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libchartcontrollerl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libchartmodell[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcharttoolsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libchartviewl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcollator_data.so
-%attr(755,root,root) %{basisdir}/program/libcomphelp4gcc3.so
-%attr(755,root,root) %{basisdir}/program/libcppcanvasl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libctll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcuil[ipx].so
-%{!?with_system_db:%attr(755,root,root) %{basisdir}/program/libdb-4.2.so}
-%attr(755,root,root) %{basisdir}/program/libdbacfgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbasel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbaxmll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbmml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbpool2.so
-%attr(755,root,root) %{basisdir}/program/libdbtoolsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbul[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdeploymentmiscl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdesktop_detectorl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdict_ja.so
-%attr(755,root,root) %{basisdir}/program/libdict_zh.so
-%attr(755,root,root) %{basisdir}/program/libdrawinglayerl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeditengl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeggtrayl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libegil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libembobj.so
-%attr(755,root,root) %{basisdir}/program/libemboleobj.so
-%attr(755,root,root) %{basisdir}/program/libemel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libepbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libepgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeppl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libepsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libeptl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liberal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libetil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libevtatt.so
-%attr(755,root,root) %{basisdir}/program/libexlinkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libexpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfileacc.so
-%attr(755,root,root) %{basisdir}/program/libfilel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfilterconfig1.so
-%attr(755,root,root) %{basisdir}/program/libflatl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libforl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libforuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfrml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libfwml[ipx].so
-%attr(755,root,root) %{basisdir}/program/libguesslangl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libhelplinkerl[ipx].so
-%{!?with_system_hunspell:%attr(755,root,root) %{basisdir}/program/libhunspell.so}
-%attr(755,root,root) %{basisdir}/program/libhyphenl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libi18nisolang1gcc3.so
-%attr(755,root,root) %{basisdir}/program/libi18npaperl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libi18nregexpgcc3.so
-%attr(755,root,root) %{basisdir}/program/libi18nutilgcc3.so
-%attr(755,root,root) %{basisdir}/program/libicdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libicgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libidxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libindex_data.so
-%attr(755,root,root) %{basisdir}/program/libimel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libiptl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libipxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libiral[ipx].so
-%attr(755,root,root) %{basisdir}/program/libitgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libitil[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblegacy_binfiltersl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblngl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblnthl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_en.so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_es.so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_euro.so
-%attr(755,root,root) %{basisdir}/program/liblocaledata_others.so
-%attr(755,root,root) %{basisdir}/program/liblogl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libmcnttype.so
-%attr(755,root,root) %{basisdir}/program/libmozbootstrap.so
-%attr(755,root,root) %{basisdir}/program/libmsfilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libmsformsl[ipx].uno.so
-%attr(755,root,root) %{basisdir}/program/libmtfrenderer.uno.so
-%attr(755,root,root) %{basisdir}/program/libmysqll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libodbcl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libodbcbasel[ipx].so
-%attr(755,root,root) %{basisdir}/program/liboffaccl[ipx].so
-%attr(755,root,root) %{basisdir}/program/liboooimprovecorel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libooxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpackage2.so
-%attr(755,root,root) %{basisdir}/program/libpcrl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpdffilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libpreloadl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libprotocolhandlerl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libqstart_gtkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/librecentfile.so
-%attr(755,root,root) %{basisdir}/program/libresl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsaxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsbl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscnl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscriptframe.so
-%attr(755,root,root) %{basisdir}/program/libsdbc2.so
-%attr(755,root,root) %{basisdir}/program/libsdbtl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsddl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsdfiltl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsduil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsfxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsofficeapp.so
-%attr(755,root,root) %{basisdir}/program/libsotl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspelll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspl_unxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libspll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsrtrs1.so
-%attr(755,root,root) %{basisdir}/program/libstsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvtl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvxcorel[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libswl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtextcat.so
-%attr(755,root,root) %{basisdir}/program/libtextconv_dict.so
-%attr(755,root,root) %{basisdir}/program/libtextconversiondlgsl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libtvhlp1.so
-%attr(755,root,root) %{basisdir}/program/libucb1.so
-%attr(755,root,root) %{basisdir}/program/libucbhelper4gcc3.so
-%attr(755,root,root) %{basisdir}/program/libucpchelp1.so
-%attr(755,root,root) %{basisdir}/program/libucpdav1.so
-%attr(755,root,root) %{basisdir}/program/libucpfile1.so
-%attr(755,root,root) %{basisdir}/program/libucpftp1.so
-%attr(755,root,root) %{basisdir}/program/libucphier1.so
-%attr(755,root,root) %{basisdir}/program/libucppkg1.so
-%attr(755,root,root) %{basisdir}/program/libunopkgapp.so
-%attr(755,root,root) %{basisdir}/program/libunordfl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libunoxmll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libupdchkl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libutll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libuuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvbahelperl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvbaswobjl[ipx].uno.so
-%attr(755,root,root) %{basisdir}/program/libvcll[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvclplug_genl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvclplug_svpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxcrl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxmlfal[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxmlfdl[ipx].so
+%dir %{_libdir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/help
+%{_datadir}/%{name}/help/*.xsl
+
+%dir %{_libdir}/%{name}/presets
+%dir %{_libdir}/%{name}/presets/autotext
+%{_libdir}/%{name}/presets/autotext/mytexts.bau
+%{_libdir}/%{name}/presets/basic
+%dir %{_libdir}/%{name}/presets/config
+%{_libdir}/%{name}/presets/config/autotbl.fmt
+%{_libdir}/%{name}/presets/config/*.so[bcdegh]
+%{_libdir}/%{name}/presets/database
+%{_libdir}/%{name}/presets/gallery
+%{_libdir}/%{name}/presets/psprint
+
+%dir %{_libdir}/%{name}/program
+%attr(755,root,root) %{_libdir}/%{name}/program/libbasprovlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcairocanvaslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcanvasfactorylo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcmdmaillo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libconfigmgrlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdesktopbe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdlgprovlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libexpwraplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfastsaxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfpickerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfps_officelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfsstoragelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhatchwindowfactorylo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18npoollo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18nsearchlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libldapbe2lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblosessioninstalllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocalebe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmtfrendererlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmigrationoo2lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmigrationoo3lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmsformslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpasswordcontainerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsimplecanvaslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libslideshowlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libstringresourcelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsysshlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpcmis1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpexpand1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpextlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucptdoc1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libupdatefeedlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbaeventslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclcanvaslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/cde-open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/gengal
+%attr(755,root,root) %{_libdir}/%{name}/program/gengal.bin
+%attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
+%attr(755,root,root) %{_libdir}/%{name}/program/libacclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libavmediagst*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libavmedialo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbasctllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbasebmplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbasegfxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbiblo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcached1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcanvastoolslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libchartcontrollerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libchartcorelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcollator_data.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcppcanvaslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libctllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcuilo.so
+%{!?with_system_db:%attr(755,root,root) %{_libdir}/%{name}/program/libdb-4.2.so}
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbalo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbaselo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbaxmllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbmmlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbpool2.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbtoolslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbulo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdeployment.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdeploymentgui.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdeploymentmisclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdesktop_detectorlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdict_ja.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdict_zh.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdrawinglayerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libeditenglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libegilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libembobj.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libemboleobj.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libemelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libepblo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libepglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libepplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libepslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libeptlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liberalo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libetilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libevtattlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libexplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfileacc.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfilelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfilterconfiglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libflatlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libforlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libforuilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfrmlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfwelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfwilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfwklo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfwllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfwmlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libguesslanglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhelplinkerlo.so
+%{!?with_system_hunspell:%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so}
+%attr(755,root,root) %{_libdir}/%{name}/program/libhyphenlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18nlangtag.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18nutil.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libicdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libicglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libidxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libindex_data.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libimelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libipblo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libipdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libipslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libiptlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libipxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libiralo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libitglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libitilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblnglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblnthlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_en.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_es.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_euro.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_others.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libloglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmcnttype.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmorklo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmozbootstrap.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmsfilterlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmysqllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libodbclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libodbcbaselo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libodfflatxmllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liboffacclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libooxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpackage2.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpcrlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpdffilterlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libprotocolhandlerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libqstart_gtklo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librecentfile.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libreslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpricinglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsaxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsblo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libscnlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libscriptframe.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsdbc2.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsdbtlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsddlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsdfiltlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsduilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsfxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsofficeapp.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsotlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libspalo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libspelllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libspl_unxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libspllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsrtrs1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvgiolo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvtlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvxcorelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libswlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtextfdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtextconv_dict.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtextconversiondlgslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtklo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtvhlp1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucb1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucbhelper.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpchelp1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpdav1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpfile1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpftp1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucphier1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucppkg1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libunopkgapp.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libunordflo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libunoxmllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libutllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libuuilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbahelperlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvcllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_genlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_svplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwpftdrawlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlfalo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlfdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlscriptlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcomphelper.so
  ## maybe external is possible?
  # - external broken in 3.0.1
  ## maybe external is possible?
  # - external broken in 3.0.1
-###%attr(755,root,root) %{basisdir}/program/libxmlsec1*.so
+###%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsec1*.so
  ##
  ##
-%attr(755,root,root) %{basisdir}/program/libxmlsecurity.so
-%attr(755,root,root) %{basisdir}/program/libxmxl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxofl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxol[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxsec_fw.so
-%attr(755,root,root) %{basisdir}/program/libxsec_xmlsec.so
-%attr(755,root,root) %{basisdir}/program/libxsltdlgl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxsltfilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libxstor.so
-%attr(755,root,root) %{basisdir}/program/localebe1.uno.so
-%attr(755,root,root) %{basisdir}/program/migrationoo2.uno.so
-%attr(755,root,root) %{basisdir}/program/migrationoo3.uno.so
-%attr(755,root,root) %{basisdir}/program/open-url
-%attr(755,root,root) %{basisdir}/program/pagein*
-%attr(755,root,root) %{basisdir}/program/passwordcontainer.uno.so
-%attr(755,root,root) %{basisdir}/program/pluginapp.bin
-%attr(755,root,root) %{basisdir}/program/productregistration.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsecurity.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxoflo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxolo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxsec_fw.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxsec_xmlsec.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxsltdlglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxsltfilterlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxstor.so
+%attr(755,root,root) %{_libdir}/%{name}/program/open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/oosplash
+%attr(755,root,root) %{_libdir}/%{name}/program/pagein*
+%attr(755,root,root) %{_libdir}/%{name}/program/pluginapp.bin
  ## seems to be exactly the same as in -ure
  ## seems to be exactly the same as in -ure
-#%attr(755,root,root) %{basisdir}/program/regcomp
-#%attr(755,root,root) %{basisdir}/program/regcomp.bin
+#%attr(755,root,root) %{_libdir}/%{name}/program/regcomp
+#%attr(755,root,root) %{_libdir}/%{name}/program/regcomp.bin
  ##
  ##
-%attr(755,root,root) %{basisdir}/program/sax.uno.so
-%attr(755,root,root) %{basisdir}/program/senddoc
-%attr(755,root,root) %{basisdir}/program/simplecanvas.uno.so
-%attr(755,root,root) %{basisdir}/program/slideshow.uno.so
-%attr(755,root,root) %{basisdir}/program/spadmin.bin
-%attr(755,root,root) %{basisdir}/program/stringresource*.uno.so
-%attr(755,root,root) %{basisdir}/program/syssh.uno.so
-%attr(755,root,root) %{basisdir}/program/ucpexpand1.uno.so
-%attr(755,root,root) %{basisdir}/program/ucpext.uno.so
-%attr(755,root,root) %{basisdir}/program/ucptdoc1.uno.so
-%attr(755,root,root) %{basisdir}/program/updatefeed.uno.so
-%attr(755,root,root) %{basisdir}/program/uri-encode
-%attr(755,root,root) %{basisdir}/program/vbaevents*.uno.so
-%attr(755,root,root) %{basisdir}/program/vclcanvas.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/senddoc
+%attr(755,root,root) %{_libdir}/%{name}/program/spadmin.bin
+%attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
  
  %if %{with java}
  
  %if %{with java}
-%attr(755,root,root) %{basisdir}/program/libhsqldb.so
-%attr(755,root,root) %{basisdir}/program/libjdbcl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libofficebean.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libjdbclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libofficebean.so
  %endif
  
  %if %{with mono}
  %endif
  
  %if %{with mono}
-%attr(755,root,root) %{basisdir}/program/libcli_uno.so
-%attr(755,root,root) %{basisdir}/program/libcli_uno_glue.so
-%{basisdir}/program/cli_basetypes.dll
-%{basisdir}/program/cli_cppuhelper.dll
-%{basisdir}/program/cli_types.dll
-%{basisdir}/program/cli_uno_bridge.dll
-%{basisdir}/program/cli_ure.dll
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno_glue.so
+%{_libdir}/%{name}/program/cli_basetypes.dll
+%{_libdir}/%{name}/program/cli_cppuhelper.dll
+%{_libdir}/%{name}/program/cli_types.dll
+%{_libdir}/%{name}/program/cli_uno_bridge.dll
+%{_libdir}/%{name}/program/cli_ure.dll
  %endif
  
  %endif
  
-%{basisdir}/program/fundamentalbasisrc
-%{basisdir}/program/gengalrc
-%{basisdir}/program/legacy_binfilters.rdb
-%{basisdir}/program/offapi.rdb
-%{basisdir}/program/oovbaapi.rdb
-%{basisdir}/program/root3.dat
-%{basisdir}/program/root4.dat
-%{basisdir}/program/root5.dat
-%{basisdir}/program/services.rdb
-%config(noreplace) %verify(not md5 mtime size) %{basisdir}/program/unorc
-%{basisdir}/program/versionrc
+%{_libdir}/%{name}/program/root3.dat
+%{_libdir}/%{name}/program/root4.dat
+%{_libdir}/%{name}/program/root5.dat
+%config(noreplace) %verify(not md5 mtime size) %{_libdir}/%{name}/program/unorc
+%{_libdir}/%{name}/program/versionrc
  
  %if %{with java}
  
  %if %{with java}
-%dir %{basisdir}/program/classes
-%{basisdir}/program/classes/LuceneHelpWrapper.jar
-%{basisdir}/program/classes/ScriptFramework.jar
-%{basisdir}/program/classes/ScriptProviderForBeanShell.jar
-%{basisdir}/program/classes/ScriptProviderForJava.jar
-%{basisdir}/program/classes/ScriptProviderForJavaScript.jar
-%{basisdir}/program/classes/XMergeBridge.jar
-%{basisdir}/program/classes/XSLTFilter.jar
-%{basisdir}/program/classes/XSLTValidate.jar
-%{basisdir}/program/classes/agenda.jar
-%{basisdir}/program/classes/commonwizards.jar
-%{basisdir}/program/classes/fax.jar
-%{basisdir}/program/classes/form.jar
-%{!?with_system_hsqldb:%{basisdir}/program/classes/hsqldb.jar}
-%{basisdir}/program/classes/js.jar
-%{basisdir}/program/classes/letter.jar
-%{basisdir}/program/classes/officebean.jar
-%{basisdir}/program/classes/query.jar
-%{basisdir}/program/classes/report.jar
-%{basisdir}/program/classes/saxon9.jar
-%{basisdir}/program/classes/sdbc_hsqldb.jar
-%{!?with_system_xalan:%{basisdir}/program/classes/serializer.jar}
-%{basisdir}/program/classes/table.jar
-%{basisdir}/program/classes/unoil.jar
-%{basisdir}/program/classes/web.jar
-%{!?with_system_xalan:%{basisdir}/program/classes/xalan.jar}
-%{basisdir}/program/classes/xmerge.jar
+%dir %{_libdir}/%{name}/program/classes
+%{_libdir}/%{name}/program/classes/reportbuilder.jar
+%{_libdir}/%{name}/program/classes/reportbuilderwizard.jar
+%{_libdir}/%{name}/program/classes/ScriptFramework.jar
+%{_libdir}/%{name}/program/classes/ScriptProviderForBeanShell.jar
+%{_libdir}/%{name}/program/classes/ScriptProviderForJavaScript.jar
+%{_libdir}/%{name}/program/classes/ScriptProviderForJava.jar
+%{_libdir}/%{name}/program/classes/XMergeBridge.jar
+#%{_libdir}/%{name}/program/classes/XSLTFilter.jar
+#%{_libdir}/%{name}/program/classes/XSLTValidate.jar
+%{_libdir}/%{name}/program/classes/commonwizards.jar
+#%{_libdir}/%{name}/program/classes/fax.jar
+%{_libdir}/%{name}/program/classes/form.jar
+%{!?with_system_hsqldb:%{_libdir}/%{name}/program/classes/hsqldb.jar}
+%{_libdir}/%{name}/program/classes/js.jar
+#%{_libdir}/%{name}/program/classes/letter.jar
+%{_libdir}/%{name}/program/classes/officebean.jar
+%{_libdir}/%{name}/program/classes/query.jar
+%{_libdir}/%{name}/program/classes/report.jar
+#%{_libdir}/%{name}/program/classes/saxon9.jar
+%{_libdir}/%{name}/program/classes/sdbc_hsqldb.jar
+%{!?with_system_xalan:%{_libdir}/%{name}/program/classes/serializer.jar}
+%{_libdir}/%{name}/program/classes/table.jar
+%{_libdir}/%{name}/program/classes/unoil.jar
+%{!?with_system_xalan:%{_libdir}/%{name}/program/classes/xalan.jar}
+%{_libdir}/%{name}/program/classes/xmerge.jar
+%{_libdir}/%{name}/program/services/scriptproviderforbeanshell.rdb
+%{_libdir}/%{name}/program/services/scriptproviderforjavascript.rdb
  %endif
  %endif
+%dir %{_libdir}/%{name}/program/services
+%{_libdir}/%{name}/program/services/services.rdb
+%dir %{_libdir}/%{name}/program/types
+%{_libdir}/%{name}/program/types/offapi.rdb
+%{_libdir}/%{name}/program/types/oovbaapi.rdb
  
  
-%dir %{basisdir}/program/resource
-%{basisdir}/program/resource/accen-US.res
-%{basisdir}/program/resource/avmediaen-US.res
-%{basisdir}/program/resource/basctlen-US.res
-%{basisdir}/program/resource/bf_frmen-US.res
-%{basisdir}/program/resource/bf_ofaen-US.res
-%{basisdir}/program/resource/bf_schen-US.res
-%{basisdir}/program/resource/bf_sden-US.res
-%{basisdir}/program/resource/bf_svten-US.res
-%{basisdir}/program/resource/bf_svxen-US.res
-%{basisdir}/program/resource/bf_swen-US.res
-%{basisdir}/program/resource/biben-US.res
-%{basisdir}/program/resource/calen-US.res
-%{basisdir}/program/resource/cuien-US.res
-%{basisdir}/program/resource/chartcontrolleren-US.res
-%{basisdir}/program/resource/dbaen-US.res
-%{basisdir}/program/resource/dbmmen-US.res
-%{basisdir}/program/resource/dbwen-US.res
-%{basisdir}/program/resource/deploymenten-US.res
-%{basisdir}/program/resource/deploymentguien-US.res
-%{basisdir}/program/resource/dkten-US.res
-%{basisdir}/program/resource/editengen-US.res
-%{basisdir}/program/resource/egien-US.res
-%{basisdir}/program/resource/emeen-US.res
-%{basisdir}/program/resource/epben-US.res
-%{basisdir}/program/resource/epgen-US.res
-%{basisdir}/program/resource/eppen-US.res
-%{basisdir}/program/resource/epsen-US.res
-%{basisdir}/program/resource/epten-US.res
-%{basisdir}/program/resource/euren-US.res
-%{basisdir}/program/resource/foren-US.res
-%{basisdir}/program/resource/foruien-US.res
-%{basisdir}/program/resource/fps_officeen-US.res
-%{basisdir}/program/resource/frmen-US.res
-%{basisdir}/program/resource/fween-US.res
-%{basisdir}/program/resource/galen-US.res
-%{basisdir}/program/resource/impen-US.res
-%{basisdir}/program/resource/ofaen-US.res
-%{basisdir}/program/resource/pcren-US.res
-%{basisdir}/program/resource/pdffilteren-US.res
-%{basisdir}/program/resource/preloaden-US.res
-%{basisdir}/program/resource/productregistrationen-US.res
-%{basisdir}/program/resource/sanen-US.res
-%{basisdir}/program/resource/sben-US.res
-%{basisdir}/program/resource/sden-US.res
-%{basisdir}/program/resource/sdbten-US.res
-%{basisdir}/program/resource/sfxen-US.res
-%{basisdir}/program/resource/spaen-US.res
-%{basisdir}/program/resource/svsen-US.res
-%{basisdir}/program/resource/svten-US.res
-%{basisdir}/program/resource/svxen-US.res
-%{basisdir}/program/resource/swen-US.res
-%{basisdir}/program/resource/textconversiondlgsen-US.res
-%{basisdir}/program/resource/tken-US.res
-%{basisdir}/program/resource/tplen-US.res
-%{basisdir}/program/resource/updchken-US.res
-%{basisdir}/program/resource/upden-US.res
-%{basisdir}/program/resource/uuien-US.res
-%{basisdir}/program/resource/vclen-US.res
-%{basisdir}/program/resource/wzien-US.res
-%{basisdir}/program/resource/xmlsecen-US.res
-%{basisdir}/program/resource/xsltdlgen-US.res
-
-%dir %{basisdir}/share
-%dir %{basisdir}/share/Scripts
-%{basisdir}/share/Scripts/beanshell
-%{basisdir}/share/Scripts/javascript
+%dir %{_libdir}/%{name}/program/resource
+%{_libdir}/%{name}/program/resource/accen-US.res
+%{_libdir}/%{name}/program/resource/avmediaen-US.res
+%{_libdir}/%{name}/program/resource/basctlen-US.res
+%{_libdir}/%{name}/program/resource/biben-US.res
+#%{_libdir}/%{name}/program/resource/calen-US.res
+%{_libdir}/%{name}/program/resource/cuien-US.res
+%{_libdir}/%{name}/program/resource/chartcontrolleren-US.res
+%{_libdir}/%{name}/program/resource/dbaen-US.res
+%{_libdir}/%{name}/program/resource/dbmmen-US.res
+%{_libdir}/%{name}/program/resource/dbwen-US.res
+%{_libdir}/%{name}/program/resource/deploymenten-US.res
+%{_libdir}/%{name}/program/resource/deploymentguien-US.res
+%{_libdir}/%{name}/program/resource/dkten-US.res
+%{_libdir}/%{name}/program/resource/editengen-US.res
+%{_libdir}/%{name}/program/resource/epsen-US.res
+%{_libdir}/%{name}/program/resource/euren-US.res
+%{_libdir}/%{name}/program/resource/foren-US.res
+%{_libdir}/%{name}/program/resource/foruien-US.res
+%{_libdir}/%{name}/program/resource/fps_officeen-US.res
+%{_libdir}/%{name}/program/resource/frmen-US.res
+%{_libdir}/%{name}/program/resource/fween-US.res
+%{_libdir}/%{name}/program/resource/galen-US.res
+%{_libdir}/%{name}/program/resource/impen-US.res
+%{_libdir}/%{name}/program/resource/ofaen-US.res
+%{_libdir}/%{name}/program/resource/pcren-US.res
+%{_libdir}/%{name}/program/resource/pdffilteren-US.res
+%{_libdir}/%{name}/program/resource/sben-US.res
+%{_libdir}/%{name}/program/resource/scnen-US.res
+%{_libdir}/%{name}/program/resource/sden-US.res
+%{_libdir}/%{name}/program/resource/sdbten-US.res
+%{_libdir}/%{name}/program/resource/sfxen-US.res
+%{_libdir}/%{name}/program/resource/spaen-US.res
+%{_libdir}/%{name}/program/resource/svlen-US.res
+%{_libdir}/%{name}/program/resource/svten-US.res
+%{_libdir}/%{name}/program/resource/svxen-US.res
+%{_libdir}/%{name}/program/resource/swen-US.res
+%{_libdir}/%{name}/program/resource/textconversiondlgsen-US.res
+%{_libdir}/%{name}/program/resource/tken-US.res
+%{_libdir}/%{name}/program/resource/tplen-US.res
+%{_libdir}/%{name}/program/resource/upden-US.res
+%{_libdir}/%{name}/program/resource/uuien-US.res
+%{_libdir}/%{name}/program/resource/vclen-US.res
+%{_libdir}/%{name}/program/resource/wzien-US.res
+%{_libdir}/%{name}/program/resource/xmlsecen-US.res
+%{_libdir}/%{name}/program/resource/xsltdlgen-US.res
+%{_libdir}/%{name}/program/tde-open-url
+
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/labels
+%{_libdir}/%{name}/share/labels/labels.xml
+%dir %{_libdir}/%{name}/share/Scripts
+%{_libdir}/%{name}/share/Scripts/beanshell
+%{_libdir}/%{name}/share/Scripts/javascript
  %if %{with java}
  %if %{with java}
-%{basisdir}/share/Scripts/java
+%{_libdir}/%{name}/share/Scripts/java
  %endif
  
  %endif
  
-%dir %{basisdir}/share/autocorr
-%{basisdir}/share/autocorr/acor_*.dat
-%dir %{basisdir}/share/autotext
-%{basisdir}/share/autotext/en-US
-%{basisdir}/share/basic
-%dir %{basisdir}/share/config
-%{basisdir}/share/config/images.zip
-%{basisdir}/share/config/images_classic.zip
-%{basisdir}/share/config/images_crystal.zip
-%{basisdir}/share/config/images_hicontrast.zip
-%{basisdir}/share/config/images_oxygen.zip
-%{basisdir}/share/config/images_tango.zip
-%{basisdir}/share/config/javasettingsunopkginstall.xml
-%{basisdir}/share/config/*.xpm
-%dir %{basisdir}/share/config/soffice.cfg
-%dir %{basisdir}/share/config/soffice.cfg/modules
-%{basisdir}/share/config/soffice.cfg/modules/BasicIDE
-%{basisdir}/share/config/soffice.cfg/modules/StartModule
-%dir %{basisdir}/share/config/soffice.cfg/modules/dbapp
-%dir %{basisdir}/share/config/soffice.cfg/modules/dbbrowser
-%dir %{basisdir}/share/config/soffice.cfg/modules/dbquery
-%dir %{basisdir}/share/config/soffice.cfg/modules/dbreport
-%dir %{basisdir}/share/config/soffice.cfg/modules/dbtdata
-%dir %{basisdir}/share/config/soffice.cfg/modules/scalc
-%{basisdir}/share/config/soffice.cfg/modules/schart
-%dir %{basisdir}/share/config/soffice.cfg/modules/sdraw
-%dir %{basisdir}/share/config/soffice.cfg/modules/sglobal
-%{basisdir}/share/config/soffice.cfg/modules/sglobal/menubar
-%{basisdir}/share/config/soffice.cfg/modules/sglobal/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/sglobal/toolbar
-%dir %{basisdir}/share/config/soffice.cfg/modules/sweb
-%dir %{basisdir}/share/config/soffice.cfg/modules/simpress
-%dir %{basisdir}/share/config/soffice.cfg/modules/swform
-%{basisdir}/share/config/soffice.cfg/modules/swform/menubar
-%{basisdir}/share/config/soffice.cfg/modules/swform/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/swform/toolbar
-%dir %{basisdir}/share/config/soffice.cfg/modules/swreport
-%{basisdir}/share/config/soffice.cfg/modules/swreport/menubar
-%{basisdir}/share/config/soffice.cfg/modules/swreport/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/swreport/toolbar
-%dir %{basisdir}/share/config/soffice.cfg/modules/swriter
-%dir %{basisdir}/share/config/soffice.cfg/modules/swxform
-%{basisdir}/share/config/soffice.cfg/modules/swxform/menubar
-%{basisdir}/share/config/soffice.cfg/modules/swxform/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/swxform/toolbar
-%{basisdir}/share/config/symbol
-%{basisdir}/share/config/webcast
-%{basisdir}/share/config/wizard
-%dir %{basisdir}/share/dtd
-%{basisdir}/share/dtd/officedocument
-%{basisdir}/share/fingerprint
-%{basisdir}/share/fonts
-%{basisdir}/share/gallery
-%{basisdir}/share/psprint
-
-%dir %{basisdir}/share/registry
-%{basisdir}/share/registry/Langpack-en-US.xcd
-%{basisdir}/share/registry/binfilter.xcd
-%{basisdir}/share/registry/lingucomponent.xcd
-%{basisdir}/share/registry/main.xcd
-%{basisdir}/share/registry/oo-ad-ldap.xcd.sample
-%{basisdir}/share/registry/oo-ldap.xcd.sample
-%dir %{basisdir}/share/registry/res
-%{basisdir}/share/registry/res/fcfg_langpack_en-US.xcd
-
-%dir %{basisdir}/share/samples
-%dir %{basisdir}/share/samples/en-US
-
-%dir %{basisdir}/share/template
-%{basisdir}/share/template/en-US
-%{basisdir}/share/template/layout
-%dir %{basisdir}/share/template/wizard
-%{basisdir}/share/template/wizard/bitmap
-%dir %{basisdir}/share/template/wizard/letter
-%{basisdir}/share/template/wizard/letter/en-US
-
-%dir %{basisdir}/share/wordbook
-%{basisdir}/share/wordbook/en-US
-
-%dir %{basisdir}/share/xslt
-%{basisdir}/share/xslt/common
-%dir %{basisdir}/share/xslt/export
-%{basisdir}/share/xslt/export/common
-%{basisdir}/share/xslt/export/spreadsheetml
-%{basisdir}/share/xslt/export/uof
-%{basisdir}/share/xslt/export/wordml
-%{basisdir}/share/xslt/import
+%dir %{_libdir}/%{name}/share/autocorr
+%{_libdir}/%{name}/share/autocorr/acor_*.dat
+%dir %{_libdir}/%{name}/share/autotext
+%{_libdir}/%{name}/share/autotext/en-US
+%{_libdir}/%{name}/share/basic
+%dir %{_libdir}/%{name}/share/config
+%{_libdir}/%{name}/share/config/images.zip
+%{_libdir}/%{name}/share/config/images_crystal.zip
+%{_libdir}/%{name}/share/config/images_hicontrast.zip
+%{_libdir}/%{name}/share/config/images_oxygen.zip
+%{_libdir}/%{name}/share/config/images_tango.zip
+%{_libdir}/%{name}/share/config/*.xpm
+%dir %{_libdir}/%{name}/share/config/soffice.cfg
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/cui
+%{_libdir}/%{name}/share/config/soffice.cfg/cui/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/cui/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/dbaccess
+%{_libdir}/%{name}/share/config/soffice.cfg/dbaccess/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/dbaccess/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/desktop
+%{_libdir}/%{name}/share/config/soffice.cfg/desktop/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/desktop/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/filter
+%{_libdir}/%{name}/share/config/soffice.cfg/filter/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/filter/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/BasicIDE
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/StartModule
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/BasicIDE/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbapp
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbquery
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbreport
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbtdata
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/schart
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/schart/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal/toolbar
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/smath
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/sweb
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/swform
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swform/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swform/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swform/toolbar
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/swreport
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swreport/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swreport/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swreport/toolbar
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/swriter
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/swxform
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swxform/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swxform/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swxform/toolbar
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/spa
+%{_libdir}/%{name}/share/config/soffice.cfg/spa/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/spa/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/sfx
+%{_libdir}/%{name}/share/config/soffice.cfg/sfx/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/sfx/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/svt
+%{_libdir}/%{name}/share/config/soffice.cfg/svt/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/svt/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/svx
+%{_libdir}/%{name}/share/config/soffice.cfg/svx/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/svx/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/uui
+%{_libdir}/%{name}/share/config/soffice.cfg/uui/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/uui/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/vcl
+%{_libdir}/%{name}/share/config/soffice.cfg/vcl/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/vcl/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/xmlsec
+%{_libdir}/%{name}/share/config/soffice.cfg/xmlsec/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/xmlsec/ui/res/*
+%{_libdir}/%{name}/share/config/webcast
+%{_libdir}/%{name}/share/config/wizard
+%dir %{_libdir}/%{name}/share/dtd
+%{_libdir}/%{name}/share/dtd/officedocument
+%{_libdir}/%{name}/share/fonts
+%{_libdir}/%{name}/share/gallery
+%{_libdir}/%{name}/share/psprint
+
+%dir %{_libdir}/%{name}/share/registry
+%{_libdir}/%{name}/share/registry/reportbuilder.xcd
+%{_libdir}/%{name}/share/registry/Langpack-en-US.xcd
+%{_libdir}/%{name}/share/registry/lingucomponent.xcd
+%{_libdir}/%{name}/share/registry/main.xcd
+%{_libdir}/%{name}/share/registry/oo-ad-ldap.xcd.sample
+%{_libdir}/%{name}/share/registry/oo-ldap.xcd.sample
+%dir %{_libdir}/%{name}/share/registry/res
+%{_libdir}/%{name}/share/registry/res/fcfg_langpack_en-US.xcd
+
+#%dir %{_libdir}/%{name}/share/samples
+#%dir %{_libdir}/%{name}/share/samples/en-US
+
+%dir %{_libdir}/%{name}/share/template
+#%{_libdir}/%{name}/share/template/en-US
+%dir %{_libdir}/%{name}/share/template/common
+%{_libdir}/%{name}/share/template/common/internal
+%{_libdir}/%{name}/share/template/common/layout
+%dir %{_libdir}/%{name}/share/template/wizard
+%{_libdir}/%{name}/share/template/wizard/bitmap
+%dir %{_libdir}/%{name}/share/template/common/wizard
+%{_libdir}/%{name}/share/template/common/wizard/agenda
+%{_libdir}/%{name}/share/template/common/wizard/fax
+%{_libdir}/%{name}/share/template/common/wizard/letter
+%{_libdir}/%{name}/share/template/common/wizard/report
+%{_libdir}/%{name}/share/template/common/wizard/styles
+
+%dir %{_libdir}/%{name}/share/wordbook
+%{_libdir}/%{name}/share/wordbook/en-GB.dic
+%{_libdir}/%{name}/share/wordbook/en-US.dic
+%{_libdir}/%{name}/share/wordbook/sl.dic
+%{_libdir}/%{name}/share/wordbook/technical.dic
+
+%dir %{_libdir}/%{name}/share/xslt
+%{_libdir}/%{name}/share/xslt/common
+%dir %{_libdir}/%{name}/share/xslt/export
+%{_libdir}/%{name}/share/xslt/export/common
+%{_libdir}/%{name}/share/xslt/export/spreadsheetml
+%{_libdir}/%{name}/share/xslt/export/uof
+%{_libdir}/%{name}/share/xslt/export/wordml
+%{_libdir}/%{name}/share/xslt/import
  
  # symlink to directory
  
  # symlink to directory
-%attr(755,root,root) %{basisdir}/ure-link
+%attr(755,root,root) %{_libdir}/%{name}/ure-link
  
  
-%dir %{_libdir}/%{name}/program
  %attr(755,root,root) %{_libdir}/%{name}/program/libnpsoplugin.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libnpsoplugin.so
-%attr(755,root,root) %{_libdir}/%{name}/program/oosplash.bin
  %attr(755,root,root) %{_libdir}/%{name}/program/spadmin
  %attr(755,root,root) %{_libdir}/%{name}/program/soffice
  %attr(755,root,root) %{_libdir}/%{name}/program/soffice.bin
  %attr(755,root,root) %{_libdir}/%{name}/program/spadmin
  %attr(755,root,root) %{_libdir}/%{name}/program/soffice
  %attr(755,root,root) %{_libdir}/%{name}/program/soffice.bin
@@ -3392,47 +3459,35 @@ fi
  %attr(755,root,root) %{_libdir}/%{name}/program/unopkg
  %attr(755,root,root) %{_libdir}/%{name}/program/unopkg.bin
  %{_libdir}/%{name}/program/bootstraprc
  %attr(755,root,root) %{_libdir}/%{name}/program/unopkg
  %attr(755,root,root) %{_libdir}/%{name}/program/unopkg.bin
  %{_libdir}/%{name}/program/bootstraprc
+%{_libdir}/%{name}/program/flat_logo.svg
  %{_libdir}/%{name}/program/fundamentalrc
  %{_libdir}/%{name}/program/fundamentalrc
-%{_libdir}/%{name}/program/about.png
  %{_libdir}/%{name}/program/intro.png
  %{_libdir}/%{name}/program/redirectrc
  %{_libdir}/%{name}/program/setuprc
  %{_libdir}/%{name}/program/shell
  %{_libdir}/%{name}/program/sofficerc
  %{_libdir}/%{name}/program/intro.png
  %{_libdir}/%{name}/program/redirectrc
  %{_libdir}/%{name}/program/setuprc
  %{_libdir}/%{name}/program/shell
  %{_libdir}/%{name}/program/sofficerc
-%{_libdir}/%{name}/program/versionrc
-
-%dir %{_libdir}/%{name}/program/resource
-%{_libdir}/%{name}/program/resource/oooen-US.res
  
  # symlinks
  
  # symlinks
-%{_libdir}/%{name}/basis-link
-%{basisdir}/help
+%{_libdir}/%{name}/help
  %{_libdir}/%{name}/readmes
  
  %{_libdir}/%{name}/readmes
  
-
-%dir %{_datadir}/%{name}
  %dir %{_datadir}/%{name}/readmes
  %{_datadir}/%{name}/readmes/README_en-US
  %dir %{_datadir}/%{name}/readmes
  %{_datadir}/%{name}/readmes/README_en-US
-%dir %{_libdir}/%{name}/share
-%dir %{_libdir}/%{name}/share/config
-%{_libdir}/%{name}/share/config/images_brand.zip
  %dir %{_libdir}/%{name}/share/extensions
  %{_libdir}/%{name}/share/extensions/package.txt
  %dir %{_libdir}/%{name}/share/extensions
  %{_libdir}/%{name}/share/extensions/package.txt
-%dir %{_libdir}/%{name}/share/registry
-%{_libdir}/%{name}/share/registry/brand.xcd
-
-%{_datadir}/mime/packages/openoffice.xml
  
  
-%{_desktopdir}/lostartcenter.desktop
-%{_desktopdir}/lotemplate.desktop
-%{_desktopdir}/loooo-extension-manager.desktop
+%{_datadir}/mime/packages/libreoffice.xml
+%{_iconsdir}/hicolor/*/mimetypes/libreoffice-*.png
+%{_iconsdir}/hicolor/*/mimetypes/libreoffice-*.svg
+%{_iconsdir}/hicolor/*/apps/libreoffice-main.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-main.svg
  
  
-%{_iconsdir}/hicolor/*/apps/ooo-gulls.png
-%{_iconsdir}/hicolor/*/apps/ooo-printeradmin.png
-%{_iconsdir}/hicolor/*/apps/ooo-template.png
-%{_pixmapsdir}/ooo-gulls.png
-%{_pixmapsdir}/ooo-template.png
+%{_desktopdir}/libreoffice-qstart.desktop
+%{_desktopdir}/libreoffice-startcenter.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.svg
  
  
+%{_mandir}/man1/loffice.1
  %{_mandir}/man1/lofromtemplate.1
  %{_mandir}/man1/libreoffice.1*
  %{_mandir}/man1/unopkg.1*
  %{_mandir}/man1/lofromtemplate.1
  %{_mandir}/man1/libreoffice.1*
  %{_mandir}/man1/unopkg.1*
@@ -3440,34 +3495,31 @@ fi
  %if %{with kde}
  %files libs-kde
  %defattr(644,root,root,755)
  %if %{with kde}
  %files libs-kde
  %defattr(644,root,root,755)
-%attr(755,root,root) %{basisdir}/program/kde-open-url
-%attr(755,root,root) %{basisdir}/program/kdebe1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/kde-open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/kdebe1.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/program/kdefilepicker
  %attr(755,root,root) %{_libdir}/%{name}/program/kdefilepicker
-%attr(755,root,root) %{basisdir}/program/fps_kde.uno.so
-%attr(755,root,root) %{basisdir}/program/libkabdrv1.so
-%attr(755,root,root) %{basisdir}/program/libkab1.so
-%attr(755,root,root) %{basisdir}/program/libvclplug_kde*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fps_kde.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libkabdrv1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libkab1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde*.so
  %endif
  
  %if %{with kde4}
  %files libs-kde
  %defattr(644,root,root,755)
  %endif
  
  %if %{with kde4}
  %files libs-kde
  %defattr(644,root,root,755)
-%attr(755,root,root) %{basisdir}/program/kde-open-url
-%attr(755,root,root) %{basisdir}/program/fps_kde4.uno.so
-%attr(755,root,root) %{basisdir}/program/kde4be1.uno.so
-%attr(755,root,root) %{basisdir}/program/libvclplug_kde4*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/kde-open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde4*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libkde4be1lo.so
  %endif
  
  %files libs-gtk
  %defattr(644,root,root,755)
  %endif
  
  %files libs-gtk
  %defattr(644,root,root,755)
-%attr(755,root,root) %{basisdir}/program/fps_gnome.uno.so
-%attr(755,root,root) %{basisdir}/program/gconfbe1.uno.so
-%attr(755,root,root) %{basisdir}/program/gnome-open-url
-%attr(755,root,root) %{basisdir}/program/gnome-open-url.bin
-%attr(755,root,root) %{basisdir}/program/libevoabl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvclplug_gtk*.so
-%attr(755,root,root) %{basisdir}/program/ucpgio1.uno.so
-%{basisdir}/share/registry/gnome.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/gnome-open-url
+%attr(755,root,root) %{_libdir}/%{name}/program/gnome-open-url.bin
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libgconfbe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpgio1lo.so
+%{_libdir}/%{name}/share/registry/gnome.xcd
  
  %files base
  %defattr(644,root,root,755)
  
  %files base
  %defattr(644,root,root,755)
@@ -3475,40 +3527,37 @@ fi
  %attr(755,root,root) %{_bindir}/oobase
  %attr(755,root,root) %{_libdir}/%{name}/program/sbase
  %{_mandir}/man1/lobase.1
  %attr(755,root,root) %{_bindir}/oobase
  %attr(755,root,root) %{_libdir}/%{name}/program/sbase
  %{_mandir}/man1/lobase.1
-%{_desktopdir}/lobase.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-base.png
-%{_pixmapsdir}/ooo-base.png
-%attr(755,root,root) %{basisdir}/program/libabpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libadabasuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdbpl[ipx].so
-%attr(755,root,root) %{basisdir}/program/librptl[ipx].so
-%attr(755,root,root) %{basisdir}/program/librptuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/librptxmll[ipx].so
-%{basisdir}/program/resource/abpen-US.res
-%{basisdir}/program/resource/adabasuien-US.res
-%{basisdir}/program/resource/cnren-US.res
-%{basisdir}/program/resource/dbpen-US.res
-%{basisdir}/program/resource/dbuen-US.res
-%{basisdir}/program/resource/rpten-US.res
-%{basisdir}/program/resource/rptuien-US.res
-%{basisdir}/program/resource/sdbclen-US.res
-%{basisdir}/program/resource/sdberren-US.res
-%{basisdir}/share/config/soffice.cfg/modules/dbapp/menubar
-%{basisdir}/share/config/soffice.cfg/modules/dbapp/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/dbapp/toolbar
-%{basisdir}/share/config/soffice.cfg/modules/dbbrowser/menubar
-%{basisdir}/share/config/soffice.cfg/modules/dbbrowser/toolbar
-%{basisdir}/share/config/soffice.cfg/modules/dbquery/menubar
-%{basisdir}/share/config/soffice.cfg/modules/dbquery/toolbar
-%{basisdir}/share/config/soffice.cfg/modules/dbrelation
-%{basisdir}/share/config/soffice.cfg/modules/dbreport/menubar
-%{basisdir}/share/config/soffice.cfg/modules/dbreport/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/dbreport/toolbar
-%{basisdir}/share/config/soffice.cfg/modules/dbtable
-%{basisdir}/share/config/soffice.cfg/modules/dbtdata/menubar
-%{basisdir}/share/config/soffice.cfg/modules/dbtdata/toolbar
-%{basisdir}/share/registry/base.xcd
-%{databasisdir}/help/en/sdatabase.*
+%{_desktopdir}/libreoffice-base.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-base.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-base.svg
+%attr(755,root,root) %{_libdir}/%{name}/program/libabplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdbplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librptlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librptuilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librptxmllo.so
+%{_libdir}/%{name}/program/resource/abpen-US.res
+%{_libdir}/%{name}/program/resource/cnren-US.res
+%{_libdir}/%{name}/program/resource/dbpen-US.res
+%{_libdir}/%{name}/program/resource/dbuen-US.res
+%{_libdir}/%{name}/program/resource/rpten-US.res
+%{_libdir}/%{name}/program/resource/rptuien-US.res
+%{_libdir}/%{name}/program/resource/sdbclen-US.res
+%{_libdir}/%{name}/program/resource/sdberren-US.res
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbapp/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbapp/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbapp/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbbrowser/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbbrowser/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbquery/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbquery/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbrelation
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbreport/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbreport/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbreport/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbtable
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbtdata/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/dbtdata/toolbar
+%{_libdir}/%{name}/share/registry/base.xcd
  
  %files calc
  %defattr(644,root,root,755)
  
  %files calc
  %defattr(644,root,root,755)
@@ -3516,29 +3565,29 @@ fi
  %attr(755,root,root) %{_bindir}/oocalc
  %attr(755,root,root) %{_libdir}/%{name}/program/scalc
  %{_mandir}/man1/localc.1
  %attr(755,root,root) %{_bindir}/oocalc
  %attr(755,root,root) %{_libdir}/%{name}/program/scalc
  %{_mandir}/man1/localc.1
-%{_desktopdir}/localc.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-calc.png
-%{_pixmapsdir}/ooo-calc.png
-%{databasisdir}/help/en/scalc.*
-%attr(755,root,root) %{basisdir}/program/libanalysisl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libcalcl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libdatel[ipx].so
-%attr(755,root,root) %{basisdir}/program/liblpsolve55.so
-%attr(755,root,root) %{basisdir}/program/libscdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscfiltl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libscuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsolverl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libvbaobjl[ipx].uno.so
-%{basisdir}/program/resource/analysisen-US.res
-%{basisdir}/program/resource/bf_scen-US.res
-%{basisdir}/program/resource/dateen-US.res
-%{basisdir}/program/resource/solveren-US.res
-%{basisdir}/program/resource/scen-US.res
-%{basisdir}/share/config/soffice.cfg/modules/scalc/menubar
-%{basisdir}/share/config/soffice.cfg/modules/scalc/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/scalc/toolbar
-%{basisdir}/share/registry/calc.xcd
+%{_desktopdir}/libreoffice-calc.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-calc.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-calc.svg
+%attr(755,root,root) %{_libdir}/%{name}/program/libanalysislo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcalclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdatelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libscdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libscfiltlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libscuilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsolverlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbaobjlo.so
+%{_libdir}/%{name}/program/resource/analysisen-US.res
+%{_libdir}/%{name}/program/resource/dateen-US.res
+%{_libdir}/%{name}/program/resource/pricingen-US.res
+%{_libdir}/%{name}/program/resource/solveren-US.res
+%{_libdir}/%{name}/program/resource/scen-US.res
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/ui/res/*
+%{_libdir}/%{name}/share/registry/calc.xcd
  
  %files draw
  %defattr(644,root,root,755)
  
  %files draw
  %defattr(644,root,root,755)
@@ -3546,184 +3595,173 @@ fi
  %attr(755,root,root) %{_bindir}/oodraw
  %attr(755,root,root) %{_libdir}/%{name}/program/sdraw
  %{_mandir}/man1/lodraw.1
  %attr(755,root,root) %{_bindir}/oodraw
  %attr(755,root,root) %{_libdir}/%{name}/program/sdraw
  %{_mandir}/man1/lodraw.1
-%{_desktopdir}/lodraw.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-draw.png
-%{_pixmapsdir}/ooo-draw.png
-%{databasisdir}/help/en/sdraw.*
-%{basisdir}/share/config/soffice.cfg/modules/sdraw/menubar
-%{basisdir}/share/config/soffice.cfg/modules/sdraw/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/sdraw/toolbar
-%{basisdir}/share/registry/draw.xcd
+%{_desktopdir}/libreoffice-draw.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-draw.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-draw.svg
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui/res/*
+%{_libdir}/%{name}/share/registry/draw.xcd
  
  %files emailmerge
  %defattr(644,root,root,755)
  
  %files emailmerge
  %defattr(644,root,root,755)
-%{basisdir}/program/mailmerge.py*
+%{_libdir}/%{name}/program/mailmerge.py*
+%{_libdir}/%{name}/program/msgbox.py*
  
  %files writer
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/lowriter
  %attr(755,root,root) %{_bindir}/oowriter
  
  %files writer
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/lowriter
  %attr(755,root,root) %{_bindir}/oowriter
-%attr(755,root,root) %{basisdir}/program/libhwp.so
-%attr(755,root,root) %{basisdir}/program/liblwpftl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libmswordl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libmsworksl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libswdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libswuil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libt602filterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libwpftl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libwriterfilterl[ipx].so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhwplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblwpftlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmswordlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libswdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libswuilo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libt602filterlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwpftwriterlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwriterfilterlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbaswobjlo.so
  %attr(755,root,root) %{_libdir}/%{name}/program/swriter
  %{_mandir}/man1/lowriter.1
  %attr(755,root,root) %{_libdir}/%{name}/program/swriter
  %{_mandir}/man1/lowriter.1
-%{_desktopdir}/lowriter.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-writer.png
-%{_pixmapsdir}/ooo-writer.png
-%{databasisdir}/help/en/swriter.*
-%{basisdir}/program/resource/t602filteren-US.res
-%{basisdir}/share/config/soffice.cfg/modules/sbibliography
-%{basisdir}/share/config/soffice.cfg/modules/swriter/menubar
-%{basisdir}/share/config/soffice.cfg/modules/swriter/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/swriter/toolbar
-%{basisdir}/share/registry/writer.xcd
+%{_desktopdir}/libreoffice-writer.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-writer.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-writer.svg
+%{_libdir}/%{name}/program/resource/t602filteren-US.res
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sbibliography
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swriter/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swriter/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swriter/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/swriter/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/swriter/ui/res/*
+%{_libdir}/%{name}/share/registry/writer.xcd
  
  %files impress
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/loimpress
  %attr(755,root,root) %{_bindir}/ooimpress
  %attr(755,root,root) %{_libdir}/%{name}/program/simpress
  
  %files impress
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/loimpress
  %attr(755,root,root) %{_bindir}/ooimpress
  %attr(755,root,root) %{_libdir}/%{name}/program/simpress
-%attr(755,root,root) %{basisdir}/program/OGLTrans.uno.so
-%attr(755,root,root) %{basisdir}/program/libanimcore.so
-%attr(755,root,root) %{basisdir}/program/libplaceware*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libOGLTranslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libanimcorelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libplaceware*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libPresenterScreenlo.so
  %{_mandir}/man1/loimpress.1
  %{_mandir}/man1/loimpress.1
-%{_desktopdir}/loimpress.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-impress.png
-%{_pixmapsdir}/ooo-impress.png
-%{databasisdir}/help/en/simpress.*
-%{basisdir}/share/config/soffice.cfg/simpress
-%{basisdir}/share/config/soffice.cfg/modules/simpress/menubar
-%{basisdir}/share/config/soffice.cfg/modules/simpress/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/simpress/toolbar
-%{basisdir}/share/registry/impress.xcd
-%{basisdir}/share/registry/ogltrans.xcd
+%{_desktopdir}/libreoffice-impress.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-impress.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-impress.svg
+%{_libdir}/%{name}/share/config/soffice.cfg/simpress
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress/ui/res/*
+%{_libdir}/%{name}/share/registry/impress.xcd
+%{_libdir}/%{name}/share/registry/ogltrans.xcd
  
  %files math
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/lomath
  %attr(755,root,root) %{_bindir}/oomath
  %{_mandir}/man1/lomath.1
  
  %files math
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/lomath
  %attr(755,root,root) %{_bindir}/oomath
  %{_mandir}/man1/lomath.1
-%{_desktopdir}/lomath.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-math.png
-%{_pixmapsdir}/ooo-math.png
-%{databasisdir}/help/en/smath.*
-%attr(755,root,root) %{basisdir}/program/libsmdl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsml[ipx].so
+%{_desktopdir}/libreoffice-math.desktop
+%{_iconsdir}/hicolor/*/apps/libreoffice-math.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-math.svg
+%attr(755,root,root) %{_libdir}/%{name}/program/libsmdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsmlo.so
  %attr(755,root,root) %{_libdir}/%{name}/program/smath
  %attr(755,root,root) %{_libdir}/%{name}/program/smath
-%{basisdir}/share/dtd/math
-%{basisdir}/program/resource/bf_smen-US.res
-%{basisdir}/program/resource/smen-US.res
-%{basisdir}/share/config/soffice.cfg/modules/smath
-%{basisdir}/share/registry/math.xcd
+%{_libdir}/%{name}/program/resource/smen-US.res
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/smath/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/smath/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/smath/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/smath/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/smath/ui/res/*
+%{_libdir}/%{name}/share/registry/math.xcd
  
  %files web
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/loweb
  %attr(755,root,root) %{_bindir}/ooweb
  %{_mandir}/man1/loweb.1
  
  %files web
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_bindir}/loweb
  %attr(755,root,root) %{_bindir}/ooweb
  %{_mandir}/man1/loweb.1
-%{_desktopdir}/loweb.desktop
-%{_iconsdir}/hicolor/*/apps/ooo-web.png
-%{_pixmapsdir}/ooo-web.png
-%{basisdir}/share/config/soffice.cfg/modules/sweb/menubar
-%{basisdir}/share/config/soffice.cfg/modules/sweb/statusbar
-%{basisdir}/share/config/soffice.cfg/modules/sweb/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sweb/menubar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sweb/statusbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/sweb/toolbar
  
  %files graphicfilter
  %defattr(644,root,root,755)
  
  %files graphicfilter
  %defattr(644,root,root,755)
-%attr(755,root,root) %{basisdir}/program/libflashl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsvgfilterl[ipx].so
-%attr(755,root,root) %{basisdir}/program/libwpgimportl[ipx].so
-%{basisdir}/share/registry/graphicfilter.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/libflashlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvgfilterlo.so
+%{_libdir}/%{name}/share/registry/graphicfilter.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/libgraphicfilterlo.so
+%{_libdir}/%{name}/program/resource/flashen-US.res
  
  %files xsltfilter
  %defattr(644,root,root,755)
  
  %files xsltfilter
  %defattr(644,root,root,755)
-%{basisdir}/share/registry/xsltfilter.xcd
-%{basisdir}/share/xslt/docbook
-%{basisdir}/share/xslt/export/xhtml
-%{basisdir}/share/xslt/odfflatxml
+%{_libdir}/%{name}/share/registry/xsltfilter.xcd
+%{_libdir}/%{name}/share/xslt/docbook
+%{_libdir}/%{name}/share/xslt/export/xhtml
+%{_desktopdir}/libreoffice-xsltfilter.desktop
  
  
-%if %{with java}
-%files javafilter
-%defattr(644,root,root,755)
-%{basisdir}/program/classes/pexcel.jar
-%{basisdir}/program/classes/pocketword.jar
-%{basisdir}/program/classes/aportisdoc.jar
-%{basisdir}/share/registry/palm.xcd
-%{basisdir}/share/registry/pocketexcel.xcd
-%{basisdir}/share/registry/pocketword.xcd
-%endif
-
-%files testtools
+%files postgresql
  %defattr(644,root,root,755)
  %defattr(644,root,root,755)
-%attr(755,root,root) %{basisdir}/program/libcommunil[ipx].so
-%attr(755,root,root) %{basisdir}/program/libsimplecml[ipx].so
-%attr(755,root,root) %{basisdir}/program/testtool.bin
-%{basisdir}/program/resource/stten-US.res
-%{basisdir}/program/hid.lst
-%{basisdir}/program/testtoolrc
+%{_libdir}/%{name}/program/postgresql-sdbc.ini
+%{_libdir}/%{name}/program/services/postgresql-sdbc.rdb
+%{_libdir}/%{name}/share/registry/postgresqlsdbc.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/libpostgresql-sdbclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpostgresql-sdbc-impllo.so
  
  %files ure
  %defattr(644,root,root,755)
  %dir %{_libdir}/%{name}
  %dir %{_libdir}/%{name}/ure
  %dir %{_libdir}/%{name}/ure/bin
  
  %files ure
  %defattr(644,root,root,755)
  %dir %{_libdir}/%{name}
  %dir %{_libdir}/%{name}/ure
  %dir %{_libdir}/%{name}/ure/bin
-%attr(755,root,root) %{_libdir}/%{name}/ure/bin/regcomp
-%attr(755,root,root) %{_libdir}/%{name}/ure/bin/regcomp.bin
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/regmerge
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/regview
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/startup.sh
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/uno
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/uno.bin
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/regmerge
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/regview
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/startup.sh
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/uno
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/uno.bin
-%{_libdir}/%{name}/ure/bin/versionrc
  %if %{with java}
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/javaldx
  %endif
  %dir %{_libdir}/%{name}/ure/lib
  %if %{with java}
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/javaldx
  %endif
  %dir %{_libdir}/%{name}/ure/lib
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunoidl.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/namingservice.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libaffine_uno_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/bootstrap.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/acceptor.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/namingservice.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libaffine_uno_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/bootstrap.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/acceptor.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/bridgefac.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/connector.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/introspection.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/invocadapt.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/proxyfac.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/reflection.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/connector.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/introspection.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/invocadapt.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/proxyfac.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/reflection.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/remotebridge.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunsafe_uno_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/streams.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/textinstream.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/textoutstream.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/uuresolver.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/liblog_uno_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunsafe_uno_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/streams.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/textinstream.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/textoutstream.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/uuresolver.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/liblog_uno_uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libstore.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libsal_textenc.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libsunjavaplugin.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppu.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppuhelpergcc3.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_purpenvhelpergcc3.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_sal.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_salhelpergcc3.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppu.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppuhelpergcc3.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_purpenvhelpergcc3.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_sal.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_salhelpergcc3.so.3
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/liburp_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/stocservices.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/invocation.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libgcc3_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/stocservices.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/invocation.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libgcc3_uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmaccessgcc3.so.3
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmfwk.so.3
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libreg.so.3
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/librmcxt.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/binaryurp.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libxmlreader.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmaccess.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmfwk.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libreg.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libstore.so
  %{_libdir}/%{name}/ure/lib/jvmfwk3rc
  %{_libdir}/%{name}/ure/lib/unorc
  %if %{with java}
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjava_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjuh.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjuhx.so
  %{_libdir}/%{name}/ure/lib/jvmfwk3rc
  %{_libdir}/%{name}/ure/lib/unorc
  %if %{with java}
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjava_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjuh.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjuhx.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/sunjavaplugin.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/javaloader.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/javavm.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjpipe.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/javaloader.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/javavm.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjpipe.so
@@ -3746,74 +3784,117 @@ fi
  %endif
  
  %files pyuno
  %endif
  
  %files pyuno
-%defattr(644,root,root,755)
-%attr(755,root,root) %{basisdir}/program/libpyuno.so
-%attr(755,root,root) %{basisdir}/program/pythonloader.uno.so
-%attr(755,root,root) %{basisdir}/program/pyuno.so
-%{basisdir}/program/pythonloader.unorc
-%{basisdir}/program/officehelper.py
-%{basisdir}/program/pythonloader.py
-%{basisdir}/program/pythonscript.py
-%{basisdir}/program/uno.py
-%{basisdir}/program/unohelper.py
-%{basisdir}/share/registry/pyuno.xcd
+# -f script-provider-for-python.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/libpyuno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/pyuno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpythonloaderlo.so
+%{_libdir}/%{name}/program/pythonloader.unorc
+%{_libdir}/%{name}/program/officehelper.py
+%{_libdir}/%{name}/program/pythonloader.py
+%{_libdir}/%{name}/program/pythonscript.py
+%{_libdir}/%{name}/program/uno.py
+%{_libdir}/%{name}/program/unohelper.py
+%{_libdir}/%{name}/program/services/scriptproviderforpython.rdb
+%{_libdir}/%{name}/share/registry/librelogo.xcd
+%{_libdir}/%{name}/share/registry/pyuno.xcd
+
+# script-provider-for-python extension
+#%dir %{_libdir}/%{name}/share/extensions/script-provider-for-python
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/META-INF
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/components.rdb
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/description.xml
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/*.py
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/registration
+
+# python wizards
+%dir %{_libdir}/%{name}/program/wizards
+%{_libdir}/%{name}/program/wizards/*.py
+%dir %{_libdir}/%{name}/program/wizards/agenda
+%{_libdir}/%{name}/program/wizards/agenda/*.py
+%dir %{_libdir}/%{name}/program/wizards/common
+%{_libdir}/%{name}/program/wizards/common/*.py
+%dir %{_libdir}/%{name}/program/wizards/document
+%{_libdir}/%{name}/program/wizards/document/*.py
+%dir %{_libdir}/%{name}/program/wizards/fax
+%{_libdir}/%{name}/program/wizards/fax/*.py
+%dir %{_libdir}/%{name}/program/wizards/letter
+%{_libdir}/%{name}/program/wizards/letter/*.py
+%dir %{_libdir}/%{name}/program/wizards/text
+%{_libdir}/%{name}/program/wizards/text/*.py
+%dir %{_libdir}/%{name}/program/wizards/ui
+%{_libdir}/%{name}/program/wizards/ui/*.py
+%dir %{_libdir}/%{name}/program/wizards/ui/event
+%{_libdir}/%{name}/program/wizards/ui/event/*.py
+%dir %{_libdir}/%{name}/program/wizards/web
+%{_libdir}/%{name}/program/wizards/web/*.py
+%dir %{_libdir}/%{name}/program/wizards/web/data
+%{_libdir}/%{name}/program/wizards/web/data/*.py
+%dir %{_libdir}/%{name}/program/wizards/web/export
+%{_libdir}/%{name}/program/wizards/web/export/*.py
  
  # samples there
  
  # samples there
-%{basisdir}/share/Scripts/python
+%{_libdir}/%{name}/share/Scripts/python
  
  %files pdfimport
  
  %files pdfimport
+# -f pdfimport.lang
  %defattr(644,root,root,755)
  %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/share/extensions/pdfimport
-%attr(755,root,root) %{_libdir}/%{name}/share/extensions/pdfimport/pdfimport.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/share/extensions/pdfimport/xpdfimport
-%{_libdir}/%{name}/share/extensions/pdfimport/META-INF
-%{_libdir}/%{name}/share/extensions/pdfimport/basic
-%{_libdir}/%{name}/share/extensions/pdfimport/description.xml
-%{_libdir}/%{name}/share/extensions/pdfimport/help
-%{_libdir}/%{name}/share/extensions/pdfimport/images
-%{_libdir}/%{name}/share/extensions/pdfimport/registration
-%{_libdir}/%{name}/share/extensions/pdfimport/*.xcu
-%{_libdir}/%{name}/share/extensions/pdfimport/*.pdf
+%{_libdir}/%{name}/program/xpdfimport
+%{_libdir}/%{name}/share/registry/pdfimport.xcd
+%{_libdir}/%{name}/share/xpdfimport
+%{_libdir}/%{name}/program/libpdfimportlo.so
  
  
-%files presentation-minimizer
+%files presentation-minimizer -f presentation-minimizer.lang
  %defattr(644,root,root,755)
  %dir %{_libdir}/%{name}/share/extensions/presentation-minimizer
  %attr(755,root,root) %{_libdir}/%{name}/share/extensions/presentation-minimizer/SunPresentationMinimizer.uno.so
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/META-INF
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/bitmaps
  %defattr(644,root,root,755)
  %dir %{_libdir}/%{name}/share/extensions/presentation-minimizer
  %attr(755,root,root) %{_libdir}/%{name}/share/extensions/presentation-minimizer/SunPresentationMinimizer.uno.so
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/META-INF
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/bitmaps
+%{_libdir}/%{name}/share/extensions/presentation-minimizer/components.rdb
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/description.xml
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/description.xml
-%{_libdir}/%{name}/share/extensions/presentation-minimizer/help
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/registr*
  
  %{_libdir}/%{name}/share/extensions/presentation-minimizer/registr*
  
-%files presenter-screen
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/share/extensions/presenter-screen
-%attr(755,root,root) %{_libdir}/%{name}/share/extensions/presenter-screen/PresenterScreen.uno.so
-%{_libdir}/%{name}/share/extensions/presenter-screen/META-INF
-%{_libdir}/%{name}/share/extensions/presenter-screen/bitmaps
-%{_libdir}/%{name}/share/extensions/presenter-screen/description.xml
-%{_libdir}/%{name}/share/extensions/presenter-screen/help
-%{_libdir}/%{name}/share/extensions/presenter-screen/registry
-
-%files report-builder
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/share/extensions/report-builder
-
-%files wiki-publisher
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/share/extensions/wiki-publisher
+%files wiki-publisher -f wiki-publisher.lang
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/share/extensions/wiki-publisher
+%{_libdir}/%{name}/share/extensions/wiki-publisher/META-INF
+%{_libdir}/%{name}/share/extensions/wiki-publisher/WikiEditor
+%{_libdir}/%{name}/share/extensions/wiki-publisher/filter
+%{_libdir}/%{name}/share/extensions/wiki-publisher/help
+%{_libdir}/%{name}/share/extensions/wiki-publisher/license
+%{_libdir}/%{name}/share/extensions/wiki-publisher/registration
+%{_libdir}/%{name}/share/extensions/wiki-publisher/templates
+%{_libdir}/%{name}/share/extensions/wiki-publisher/*.xc*
+%{_libdir}/%{name}/share/extensions/wiki-publisher/components.rdb
+%{_libdir}/%{name}/share/extensions/wiki-publisher/description.xml
+%{_libdir}/%{name}/share/extensions/wiki-publisher/mediawiki.jar
+
+%files nlpsolver -f nlpsolver.lang
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/share/extensions/nlpsolver
+%{_libdir}/%{name}/share/extensions/nlpsolver/META-INF
+%{_libdir}/%{name}/share/extensions/nlpsolver/help
+%{_libdir}/%{name}/share/extensions/nlpsolver/locale
+%{_libdir}/%{name}/share/extensions/nlpsolver/registration
+%{_libdir}/%{name}/share/extensions/nlpsolver/EvolutionarySolver.jar
+%{_libdir}/%{name}/share/extensions/nlpsolver/components.rdb
+%{_libdir}/%{name}/share/extensions/nlpsolver/description.xml
+%{_libdir}/%{name}/share/extensions/nlpsolver/nlpsolver.jar
  
  %if %{with mozilla}
  %files -n browser-plugin-%{name}
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_browserpluginsdir}/libnpsoplugin.so
  
  %if %{with mozilla}
  %files -n browser-plugin-%{name}
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_browserpluginsdir}/libnpsoplugin.so
-%attr(755,root,root) %{basisdir}/program/nsplugin
+%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
  %endif
  
  %if %{with i18n}
  %files i18n-af -f af.lang
  %defattr(644,root,root,755)
  
  %endif
  
  %if %{with i18n}
  %files i18n-af -f af.lang
  %defattr(644,root,root,755)
  
+%files i18n-am -f am.lang
+%defattr(644,root,root,755)
+
  %files i18n-ar -f ar.lang
  %defattr(644,root,root,755)
  
  %files i18n-ar -f ar.lang
  %defattr(644,root,root,755)
  
@@ -3823,7 +3904,7 @@ fi
  %files i18n-ast -f ast.lang
  %defattr(644,root,root,755)
  
  %files i18n-ast -f ast.lang
  %defattr(644,root,root,755)
  
-%files i18n-be_BY -f be_BY.lang
+%files i18n-be_BY -f be.lang
  %defattr(644,root,root,755)
  
  %files i18n-bg -f bg.lang
  %defattr(644,root,root,755)
  
  %files i18n-bg -f bg.lang
@@ -3832,6 +3913,9 @@ fi
  %files i18n-bn -f bn.lang
  %defattr(644,root,root,755)
  
  %files i18n-bn -f bn.lang
  %defattr(644,root,root,755)
  
+%files i18n-bn_IN -f bn_IN.lang
+%defattr(644,root,root,755)
+
  %files i18n-bo -f bo.lang
  %defattr(644,root,root,755)
  
  %files i18n-bo -f bo.lang
  %defattr(644,root,root,755)
  
@@ -3901,6 +3985,9 @@ fi
  %files i18n-ga -f ga.lang
  %defattr(644,root,root,755)
  
  %files i18n-ga -f ga.lang
  %defattr(644,root,root,755)
  
+%files i18n-gd -f gd.lang
+%defattr(644,root,root,755)
+
  %files i18n-gl -f gl.lang
  %defattr(644,root,root,755)
  
  %files i18n-gl -f gl.lang
  %defattr(644,root,root,755)
  
@@ -3956,6 +4043,9 @@ fi
  %files i18n-ku -f ku.lang
  %defattr(644,root,root,755)
  
  %files i18n-ku -f ku.lang
  %defattr(644,root,root,755)
  
+%files i18n-lb -f lb.lang
+%defattr(644,root,root,755)
+
  %files i18n-lo -f lo.lang
  %defattr(644,root,root,755)
  
  %files i18n-lo -f lo.lang
  %defattr(644,root,root,755)
  
@@ -4001,7 +4091,7 @@ fi
  %files i18n-nr -f nr.lang
  %defattr(644,root,root,755)
  
  %files i18n-nr -f nr.lang
  %defattr(644,root,root,755)
  
-%files i18n-nso -f ns.lang
+%files i18n-nso -f nso.lang
  %defattr(644,root,root,755)
  
  %files i18n-oc -f oc.lang
  %defattr(644,root,root,755)
  
  %files i18n-oc -f oc.lang
@@ -4025,6 +4115,9 @@ fi
  %files i18n-pt_BR -f pt_BR.lang
  %defattr(644,root,root,755)
  
  %files i18n-pt_BR -f pt_BR.lang
  %defattr(644,root,root,755)
  
+#%files i18n-qtz -f qtz.lang
+#%defattr(644,root,root,755)
+
  %files i18n-ro -f ro.lang
  %defattr(644,root,root,755)
  
  %files i18n-ro -f ro.lang
  %defattr(644,root,root,755)
  
@@ -4049,6 +4142,9 @@ fi
  %files i18n-si -f si.lang
  %defattr(644,root,root,755)
  
  %files i18n-si -f si.lang
  %defattr(644,root,root,755)
  
+%files i18n-sid -f sid.lang
+%defattr(644,root,root,755)
+
  %files i18n-sk -f sk.lang
  %defattr(644,root,root,755)
  
  %files i18n-sk -f sk.lang
  %defattr(644,root,root,755)
  
@@ -4094,6 +4190,9 @@ fi
  %files i18n-ts -f ts.lang
  %defattr(644,root,root,755)
  
  %files i18n-ts -f ts.lang
  %defattr(644,root,root,755)
  
+%files i18n-tt -f tt.lang
+%defattr(644,root,root,755)
+
  %files i18n-ug -f ug.lang
  %defattr(644,root,root,755)
  
  %files i18n-ug -f ug.lang
  %defattr(644,root,root,755)
  
@@ -4125,3 +4224,8 @@ fi
  %files -n bash-completion-%{name}
  %defattr(644,root,root,755)
  /etc/bash_completion.d/*
  %files -n bash-completion-%{name}
  %defattr(644,root,root,755)
  /etc/bash_completion.d/*
+
+%files glade
+%attr(755,root,root) %{_libdir}/%{name}/program/ui-previewer
+%dir %{_libdir}/%{name}/share/glade
+%{_libdir}/%{name}/share/glade/libreoffice-catalog.xml