- fix patchlevel

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

index ba346219dc304ca6d901f908a14964eeb81a06eb..a701fd8b8bdd7b20ad6c95c1cb5c4bc5c5bd60e2 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,3 +1,6 @@
+# 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
  # NOTE - FIXME FOR 3.4.3 !!!:
  #      - normal build (i686) requires about 27 GB of disk space:
  #              $BUILD_ROOT     7.0 GB
@@ -9,6 +12,8 @@
  %bcond_without java            # without Java support (disables help support)
  %bcond_with    kde             # KDE L&F packages
  %bcond_without kde4            # KDE4 L&F packages
  %bcond_without java            # without Java support (disables help support)
  %bcond_with    kde             # KDE L&F packages
  %bcond_without kde4            # KDE4 L&F packages
+%bcond_without gtk             # GTK2 L&F
+%bcond_with    gtk3            # GTK3 L&F (experimental)
  %bcond_with    mono            # enable compilation of mono bindings
  %bcond_without mozilla         # without mozilla components
  %bcond_without i18n        # do not create i18n packages (extra build time)
  %bcond_with    mono            # enable compilation of mono bindings
  %bcond_without mozilla         # without mozilla components
  %bcond_without i18n        # do not create i18n packages (extra build time)
@@ -38,52 +43,57 @@
  %undefine      with_system_hsqldb
  %endif
  
  %undefine      with_system_hsqldb
  %endif
  
-%define                major_ver               3.5.0
+%define                major_ver               4.3.2
  
  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}.3
+Version:       %{major_ver}.2
  Release:       0.1
  License:       GPL/LGPL
  Group:         X11/Applications
  Release:       0.1
  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}-core-%{version}.tar.xz
-# Source0-md5: 209bbbc369b36963d25334c3ef7933e8
-Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-binfilter-%{version}.tar.xz
-# Source1-md5: 6e5066332a2b25b1847d3836f1260e0c
-Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source2-md5: dedde5df1752f7a489a5a7a41943ebde
-Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source3-md5: 9df4051a689526888da0467c29186e8c
-Source4:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source4-md5: 8f7d2774f635f83cebc74e1d4f609d0f
-
-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
-Patch1:                %{name}-hamcrest.patch
+Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
+# Source0-md5: 86aa9cad125fec16c5cd1d9d964e1d20
+Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
+# Source1-md5: 996ec400156194fe26d24ffbccbc5b7a
+Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
+# Source2-md5: 63a59a4c77a72856b47caf1871cfc48f
+Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
+# Source3-md5: 0236e56349006fc8fec8e7df749c13b1
+
+
+# make fetch DO_FETCH_TARBALLS=1 WGET=wget
+# but not sure if all are needed?
+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
+Source26:      http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
+# Source26-md5:        4b87018f7fff1d054939d19920b751a0
+Source27:      http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
+# Source27-md5:        1cce53bf4b40ae29790d2c5c9f8b1129
+Source28:      http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2
+# Source28-md5:        4ca8a6ef0afeefc864e9ef21b9f14bd6
+
+# put into separate spec?
+Source29:      http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.1.tar.bz2
+# Source29-md5:        03821c9c827e647fb5fedb12496e0067
+
+Patch0:                %{name}-hamcrest.patch
+Patch1:                %{name}-build.patch
  URL:           http://www.documentfoundation.org/
  BuildRequires: /usr/bin/getopt
  URL:           http://www.documentfoundation.org/
  BuildRequires: /usr/bin/getopt
+BuildRequires: Firebird-devel
  BuildRequires: GConf2-devel
  BuildRequires: GConf2-devel
+BuildRequires: GLM
  BuildRequires: ImageMagick
  BuildRequires: OpenGL-GLU-devel
  BuildRequires: OpenGL-devel
  BuildRequires: ImageMagick
  BuildRequires: OpenGL-GLU-devel
  BuildRequires: OpenGL-devel
@@ -93,9 +103,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
@@ -105,12 +117,15 @@ BuildRequires:    dbus-glib-devel >= 0.70
  BuildRequires: flex
  BuildRequires: fontconfig-devel >= 1.0.1
  BuildRequires: freetype-devel >= 2.1
  BuildRequires: flex
  BuildRequires: fontconfig-devel >= 1.0.1
  BuildRequires: freetype-devel >= 2.1
+BuildRequires: glew-devel >= 1.10.0
  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: gtk+2-devel >= 2:2.10
+BuildRequires: gstreamer0.10-devel >= 0.10.0
+BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10.0
+%{?with_gtk:BuildRequires:     gtk+2-devel >= 2:2.10}
+%{?with_gtk3:BuildRequires:    gtk+3-devel}
+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}
@@ -127,11 +142,20 @@ BuildRequires:    java-junit
  BuildRequires: java-lucene
  BuildRequires: java-lucene-contrib
  BuildRequires: java-servletapi
  BuildRequires: java-lucene
  BuildRequires: java-lucene-contrib
  BuildRequires: java-servletapi
-BuildRequires: libcmis-devel
+BuildRequires: libabw-devel >= 0.1.0
+BuildRequires: libcmis-devel >= 0.4
+BuildRequires: libe-book-devel >= 0.0.2
+BuildRequires: libetonyek-devel >= 0.1.1
+BuildRequires: libfreehand-devel >= 0.1.0
+BuildRequires: liblangtag-devel
+BuildRequires: libmspub-devel
+BuildRequires: libmwaw-devel >= 0.3.0
+BuildRequires: libodfgen-devel >= 0.1.1
+BuildRequires: liborcus-devel >= 0.7.0
  BuildRequires: libvisio-devel
  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.10.0
+BuildRequires: libwpg-devel >= 0.3.0
+BuildRequires: libwps-devel >= 0.3.0
  BuildRequires: lp_solve-devel
  BuildRequires: silgraphite-devel
  %if %{with kde}
  BuildRequires: lp_solve-devel
  BuildRequires: silgraphite-devel
  %if %{with kde}
@@ -145,6 +169,7 @@ 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
@@ -157,7 +182,7 @@ BuildRequires:      libxml2-devel >= 2.0
  BuildRequires: libxslt-devel
  BuildRequires: libxslt-progs
  %{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
  BuildRequires: libxslt-devel
  BuildRequires: libxslt-progs
  %{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
-BuildRequires: mdds-devel
+BuildRequires: mdds-devel >= 0.10.2
  %{?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}
@@ -177,12 +202,12 @@ BuildRequires:    postgresql-devel
  BuildRequires: poppler-cpp-devel >= 0.8.0
  BuildRequires: poppler-devel >= 0.8.0
  BuildRequires: portaudio-devel
  BuildRequires: poppler-cpp-devel >= 0.8.0
  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
@@ -191,11 +216,12 @@ BuildRequires:    startup-notification-devel >= 0.5
  BuildRequires: unixODBC-devel >= 2.2.12-2
  BuildRequires: unzip
  BuildRequires: vigra-devel
  BuildRequires: unixODBC-devel >= 2.2.12-2
  BuildRequires: unzip
  BuildRequires: vigra-devel
-%{?with_system_xalan:BuildRequires:    xalan-j}
+%{?with_system_xalan:BuildRequires:    java-xalan}
+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
@@ -215,13 +241,10 @@ 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}-presentation-minimizer = %{version}-%{release}
-Requires:      %{name}-presenter-screen = %{version}-%{release}
+Requires:      %{name}-postgresql = %{version}-%{release}
  Requires:      %{name}-pyuno = %{version}-%{release}
  Requires:      %{name}-pyuno = %{version}-%{release}
-Requires:      %{name}-report-builder = %{version}-%{release}
  Requires:      %{name}-web = %{version}-%{release}
  Requires:      %{name}-wiki-publisher = %{version}-%{release}
  Requires:      %{name}-writer = %{version}-%{release}
  Requires:      %{name}-web = %{version}-%{release}
  Requires:      %{name}-wiki-publisher = %{version}-%{release}
  Requires:      %{name}-writer = %{version}-%{release}
@@ -233,6 +256,9 @@ ExclusiveArch:      %{ix86} %{x8664} ppc sparc sparcv9
  BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %define                specflags       -fno-strict-aliasing -O2
  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
  
  # No ELF objects there to strip/chrpath, skips processing:
  # - share/ - 17000 files of 415M
@@ -322,13 +348,18 @@ 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-kid
+Obsoletes:     libreoffice-i18n-ku
  Obsoletes:     libreoffice-i18n-ky
  Obsoletes:     libreoffice-i18n-ms
  Obsoletes:     libreoffice-i18n-pap
  Obsoletes:     libreoffice-i18n-ps
  Obsoletes:     libreoffice-i18n-ky
  Obsoletes:     libreoffice-i18n-ms
  Obsoletes:     libreoffice-i18n-pap
  Obsoletes:     libreoffice-i18n-ps
+Obsoletes:     libreoffice-i18n-qtz
  Obsoletes:     libreoffice-i18n-sc
  Obsoletes:     libreoffice-i18n-sc
+Obsoletes:     libreoffice-i18n-sh
  Obsoletes:     libreoffice-i18n-ti
  Obsoletes:     libreoffice-i18n-ur
  Obsoletes:     oooqs
  Obsoletes:     libreoffice-i18n-ti
  Obsoletes:     libreoffice-i18n-ur
  Obsoletes:     oooqs
@@ -351,12 +382,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
@@ -421,37 +450,6 @@ Requires:  %{name}-draw = %{version}-%{release}
  The PDF Importer imports PDF into drawing documents to preserve layout
  and enable basic editing of PDF documents.
  
  The PDF Importer imports PDF into drawing documents to preserve layout
  and enable basic editing of PDF documents.
  
-%package presentation-minimizer
-Summary:       Shrink LibreOffice presentations
-Group:         X11/Applications
-Requires:      %{name}-impress = %{version}-%{release}
-
-%description presentation-minimizer
-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.
-
-%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
@@ -572,6 +570,8 @@ Requires(post,postun):      gtk-update-icon-cache
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-impress
  Requires:      %{name}-core = %{version}-%{release}
  Requires:      hicolor-icon-theme
  Obsoletes:     openoffice.org-impress
+Obsoletes:     libreoffice-presenter-screen < 4.0.0.0-1
+Obsoletes:     libreoffice-presentation-minimizer < 4.2.0.0
  
  %description impress
  Presentation application of LibreOffice.
  
  %description impress
  Presentation application of LibreOffice.
@@ -626,21 +626,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
  Group:         X11/Applications
-Requires(post,postun): desktop-file-utils
  Requires:      %{name}-core = %{version}-%{release}
  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 nlpsolver
+Summary:       Non-linear solver engine for LibreOffice Calc
+Group:         X11/Applications
+Requires:      %{name}-calc = %{version}-%{release}
+Requires:      %{name}-core = %{version}-%{release}
+Requires:      %{name}-ure = %{version}-%{release}
+
+%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
@@ -695,6 +701,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
@@ -778,6 +798,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
@@ -1490,20 +1525,20 @@ Kashmiri language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  kaszmirskim.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  kaszmirskim.
  
-%package i18n-ku
-Summary:       LibreOffice - interface in Kurdish language
-Summary(pl.UTF-8):     LibreOffice - interfejs 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}
  Group:         I18n
  Requires:      %{name}-core = %{version}-%{release}
-Obsoletes:     openoffice.org-i18n-ku
+Obsoletes:     openoffice.org-i18n-lb
  
  
-%description i18n-ku
+%description i18n-lb
  This package provides resources containing menus and dialogs in
  This package provides resources containing menus and dialogs in
-Kurdish language.
+Luxembourgish language.
  
  
-%description i18n-ku -l pl.UTF-8
+%description i18n-lb -l pl.UTF-8
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
-kurdyjskim.
+luksemburgskim.
  
  %package i18n-lo
  Summary:       LibreOffice - interface in Lao language
  
  %package i18n-lo
  Summary:       LibreOffice - interface in Lao language
@@ -1976,21 +2011,6 @@ language.
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  sindhi.
  
  Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
  sindhi.
  
-%package i18n-sh
-Summary:       LibreOffice - interface in Serbo-Croatian language
-Summary(pl.UTF-8):     LibreOffice - interfejs w języku serbsko-chorwackim
-Group:         I18n
-Requires:      %{name}-core = %{version}-%{release}
-Obsoletes:     openoffice.org-i18n-sh
-
-%description i18n-sh
-This package provides resources containing menus and dialogs in
-Serbo-Croatian language.
-
-%description i18n-sh -l pl.UTF-8
-Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
-serbsko-chorwackim.
-
  %package i18n-si
  Summary:       LibreOffice - interface in Sinhala language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku syngaleskim
  %package i18n-si
  Summary:       LibreOffice - interface in Sinhala language
  Summary(pl.UTF-8):     LibreOffice - interfejs w języku syngaleskim
@@ -2006,6 +2026,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
@@ -2252,6 +2286,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
@@ -2418,10 +2467,22 @@ 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}-core-%{version} -a1 -a2 -a3 -a4
+%setup -q -n %{name}-%{version} -a1 -a2 -a3
  
  
-%patch1 -p0
+%patch0 -p1
+%patch1 -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
@@ -2431,6 +2492,8 @@ done
  
  install -d ext_sources
  ln %{SOURCE20} ext_sources
  
  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
@@ -2438,7 +2501,6 @@ ln %{SOURCE26} ext_sources
  ln %{SOURCE27} ext_sources
  ln %{SOURCE28} ext_sources
  ln %{SOURCE29} ext_sources
  ln %{SOURCE27} ext_sources
  ln %{SOURCE28} ext_sources
  ln %{SOURCE29} ext_sources
-ln %{SOURCE30} ext_sources
  :> src.downloaded
  
  %build
  :> src.downloaded
  
  %build
@@ -2452,7 +2514,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"
@@ -2488,20 +2550,21 @@ RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
  RPM_BUILD_NR_THREADS="1"
  %endif
  
  RPM_BUILD_NR_THREADS="1"
  %endif
  
-%{__aclocal}
+%{__aclocal} -I m4
  %{__autoconf}
  touch autogen.lastrun
  
  %{__autoconf}
  touch autogen.lastrun
  
+export PATH=$PATH:%{_libdir}/interbase/bin
  %configure \
  %configure \
-       --with-num-cpus=$RPM_BUILD_NR_THREADS \
-       --with-max-jobs=1 \
-       --with-unix-wrapper=%{name} \
+       --with-vendor="%{distribution}" \
+       --with-extra-buildid="%{name}-%{epoch}:%{version}-%{release}" \
+       --enable-release-build \
+       --with-parallelism=$RPM_BUILD_NR_THREADS \
         --disable-odk \
         %{?with_ccache:--with-gcc-speedup=ccache} \
         %{?with_icecream:--with-gcc-speedup=icecream} \
         %{?with_system_agg:--with-system-agg} \
         %{?with_system_beanshell:--with-system-beanshell} \
         --disable-odk \
         %{?with_ccache:--with-gcc-speedup=ccache} \
         %{?with_icecream:--with-gcc-speedup=icecream} \
         %{?with_system_agg:--with-system-agg} \
         %{?with_system_beanshell:--with-system-beanshell} \
-       %{?with_system_db:--with-system-db} \
         --with%{!?with_system_hsqldb:out}-system-hsqldb \
         %{?with_system_hunspell:--with-system-hunspell --without-myspell-dicts} \
         %{?with_system_libhnj:--with-system-altlinuxhyphen} \
         --with%{!?with_system_hsqldb:out}-system-hsqldb \
         %{?with_system_hunspell:--with-system-hunspell --without-myspell-dicts} \
         %{?with_system_libhnj:--with-system-altlinuxhyphen} \
@@ -2515,6 +2578,7 @@ touch autogen.lastrun
         --with-external-dict-dir=/usr/share/myspell \
         --with-external-tar=$(pwd)/ext_sources \
         --with-system-expat \
         --with-external-dict-dir=/usr/share/myspell \
         --with-external-tar=$(pwd)/ext_sources \
         --with-system-expat \
+       --with-system-firebird \
         --with-system-graphite \
         --with-system-icu \
         --with-system-jpeg \
         --with-system-graphite \
         --with-system-icu \
         --with-system-jpeg \
@@ -2522,44 +2586,30 @@ touch autogen.lastrun
         --with-system-libwpg \
         --with-system-libwps \
         --with-system-libxml \
         --with-system-libwpg \
         --with-system-libwps \
         --with-system-libxml \
-       --with-system-libxslt \
-       --with-system-lucene \
-       --with-lucene-analyzers-jar=%{_javadir}/lucene-analyzers.jar \
+       --with-system-clucene \
         --with-system-neon \
         --with-system-openssl \
         --with-system-poppler \
         --with-system-neon \
         --with-system-openssl \
         --with-system-poppler \
-       --with-system-python \
+       --enable-python=system \
         --with-system-redland \
         --with-system-redland \
-       --with-system-sane-header \
-       --with-system-stdlibs \
+       --with-system-sane \
         --with-system-vigra \
         --with-system-vigra \
-       --with-system-xrender-headers=yes \
         --with-system-zlib \
         --with-system-libexttextcat \
         --with-system-jfreereport \
         --with-system-zlib \
         --with-system-libexttextcat \
         --with-system-jfreereport \
-       --with-vba-package-format="builtin" \
+       --enable-vba \
         --with-system-libs \
         --with-system-headers \
         --with-system-mythes \
         --with-system-libs \
         --with-system-headers \
         --with-system-mythes \
-       --with-system-dicts \
         --with-system-apache-commons \
         --with-junit=%{_datadir}/java/junit.jar \
         --with-system-apache-commons \
         --with-junit=%{_datadir}/java/junit.jar \
-       --without-system-saxon \
-       --without-system-sampleicc \
-       --enable-ext-presenter-minimizer \
-       --enable-ext-presenter-console \
-       --enable-ext-pdfimport \
+       --enable-ext-nlpsolver \
+       --enable-pdfimport \
         --enable-ext-wiki-publisher \
         --enable-ext-wiki-publisher \
-       --enable-ext-report-builder \
-       --enable-ext-scripting-beanshell \
-       --enable-ext-scripting-javascript \
-       --enable-ext-scripting-python \
-%if %{with mozilla}
-       --with-system-mozilla=libxul \
-%else
-       --disable-mozilla \
-%endif
-       --enable-gtk \
+       --enable-report-builder \
+       --enable-scripting-beanshell \
+       --enable-scripting-javascript \
+       --with%{!?mozilla:out}-system-npapi-headers \
         %{?with_kde:--enable-kde --disable-kde4} \
         %{?with_kde4:--enable-kde4 --disable-kde} \
         --with-lang=%{?with_i18n:ALL} \
         %{?with_kde:--enable-kde --disable-kde4} \
         %{?with_kde4:--enable-kde4 --disable-kde} \
         --with-lang=%{?with_i18n:ALL} \
@@ -2572,17 +2622,15 @@ touch autogen.lastrun
  %endif
         --disable-gnome-vfs \
         --enable-gio \
  %endif
         --disable-gnome-vfs \
         --enable-gio \
-       --without-stlport \
         --with-x \
         --without-fonts \
         --without-ppds \
         --with-x \
         --without-fonts \
         --without-ppds \
-       --without-afms \
         --disable-epm \
         --disable-epm \
-       --enable-cairo \
+       --%{?with_gtk:en}%{!?with_gtk:dis}able-gtk \
+       --%{?with_gtk3:en}%{!?with_gtk3:dis}able-gtk3 \
         --enable-dbus \
         --enable-opengl \
         --enable-dbus \
         --enable-opengl \
-       --with-openldap \
-       --disable-rpath \
+       --with-system-openldap \
  %if 0%{?debug:1}
         --enable-debug \
         --enable-crashdump=yes \
  %if 0%{?debug:1}
         --enable-debug \
         --enable-crashdump=yes \
@@ -2595,9 +2643,7 @@ touch autogen.lastrun
         --enable-split-app-modules \
         --enable-split-opt-features \
         --enable-cups \
         --enable-split-app-modules \
         --enable-split-opt-features \
         --enable-cups \
-       --enable-fontconfig \
         --enable-lockdown \
         --enable-lockdown \
-       --disable-layout \
         --disable-fetch-external
  
  # this limits processing some files but doesn't limit parallel build
         --disable-fetch-external
  
  # this limits processing some files but doesn't limit parallel build
@@ -2608,16 +2654,6 @@ touch autogen.lastrun
         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 just once (based on makeinstall.stamp)
  # this will make packaging newer versions simplier
  %install
  # install just once (based on makeinstall.stamp)
  # this will make packaging newer versions simplier
@@ -2636,26 +2672,6 @@ if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
         %{__make} distro-pack-install \
                 DESTDIR=$RPM_BUILD_ROOT
  
         %{__make} distro-pack-install \
                 DESTDIR=$RPM_BUILD_ROOT
  
-       # unpack report-builder extension
-       install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/report-builder
-       unzip -o solver/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 -o solver/unxlng*/bin/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 -o solver/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 -o solver/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 -o solver/unxlng*/bin/pdfimport/pdfimport.oxt -d $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/pdfimport
-
         # save orignal install layout
         find $RPM_BUILD_ROOT -ls > ls.txt
         touch makeinstall.stamp
         # save orignal install layout
         find $RPM_BUILD_ROOT -ls > ls.txt
         touch makeinstall.stamp
@@ -2682,7 +2698,7 @@ if [ ! -f installed.stamp ]; then
         install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
         # put share to %{_datadir} so we're able to produce noarch packages
         mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT/%{_datadir}/%{name}
         install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
         # put share to %{_datadir} so we're able to produce noarch packages
         mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT/%{_datadir}/%{name}
-       ln -s ../../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
+       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
  
@@ -2702,10 +2718,6 @@ if [ ! -f installed.stamp ]; then
                 ln -s lo$a $RPM_BUILD_ROOT%{_bindir}/oo$a
         done
  
                 ln -s lo$a $RPM_BUILD_ROOT%{_bindir}/oo$a
         done
  
-       # remove printeradmin .desktop file and icons
-       %{__rm} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/*/apps/libreoffice-printeradmin.png \
-               $RPM_BUILD_ROOT%{_desktopdir}/libreoffice-printeradmin.desktop
-
         touch installed.stamp
  fi
  
         touch installed.stamp
  fi
  
@@ -2772,6 +2784,17 @@ find_lang() {
                 # %{_libdir}/%{name}/help/$lang
                 grep "/help/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/help/${lang}/" ${lfile} >> ${langfn}.lang || :
                 # %{_libdir}/%{name}/help/$lang
                 grep "/help/${lang}$" ${lfile} >> ${langfn}.lang || :
                 grep "/help/${lang}/" ${lfile} >> ${langfn}.lang || :
+               # UI translations
+               grep "/soffice.cfg/[^/]*/ui/res/${lang}.zip" ${lfile} >> ${langfn}.lang || :
+               grep "/soffice.cfg/modules/[^/]*/ui/res/${lang}.zip" ${lfile} >> ${langfn}.lang || :
+
+               for e in wiki-publisher nlpsolver ; do
+                       for f in $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/$e/description-${lang}.txt \
+                                       $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/$e/locale/*_${langfn}.properties \
+                                       $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/$e/help/${lang} ; do
+                               [ -e $f ] && echo "%lang(${langfn}) $f" | sed -e "s|$RPM_BUILD_ROOT||g" >> $e.lang || :
+                       done
+               done
         fi
  }
  
         fi
  }
  
@@ -2789,6 +2812,23 @@ done
  ' *.lang
  %endif
  
  ' *.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
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/nlpsolver/help/*.done
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/wiki-publisher/help/*.done
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/classes/smoketest.jar
+
+# Remove unsupported locale files to avoid confusion about unpackaged files
+#for l in kmr_Latn sr_Latn; do
+#      for f in `cat file-lists/lang_${l}_list.txt` ; do
+#              [ -f $RPM_BUILD_ROOT/$f ] || continue
+#              %{__rm} -f $RPM_BUILD_ROOT/$f
+#      done
+#done
+
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@ -2856,12 +2896,6 @@ rm -rf $RPM_BUILD_ROOT
  %update_desktop_database_postun
  %update_icon_cache hicolor
  
  %update_desktop_database_postun
  %update_icon_cache hicolor
  
-%post javafilter
-%update_desktop_database_post
-
-%postun javafilter
-%update_desktop_database_postun
-
  %post -n browser-plugin-%{name}
  %update_browser_plugins
  
  %post -n browser-plugin-%{name}
  %update_browser_plugins
  
@@ -2880,7 +2914,7 @@ 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}/NOTICE
  
  %attr(755,root,root) %{_bindir}/libreoffice
  %attr(755,root,root) %{_bindir}/lofromtemplate
  
  %attr(755,root,root) %{_bindir}/libreoffice
  %attr(755,root,root) %{_bindir}/lofromtemplate
@@ -2894,12 +2928,6 @@ fi
  %dir %{_datadir}/%{name}
  %dir %{_datadir}/%{name}/help
  %{_datadir}/%{name}/help/*.xsl
  %dir %{_datadir}/%{name}
  %dir %{_datadir}/%{name}/help
  %{_datadir}/%{name}/help/*.xsl
-%dir %{_datadir}/%{name}/help/en
-%{_datadir}/%{name}/help/en/*.html
-%{_datadir}/%{name}/help/en/*.css
-%{_datadir}/%{name}/help/en/sbasic.*
-%{_datadir}/%{name}/help/en/schart.*
-%{_datadir}/%{name}/help/en/shared.*
  
  %dir %{_libdir}/%{name}/presets
  %dir %{_libdir}/%{name}/presets/autotext
  
  %dir %{_libdir}/%{name}/presets
  %dir %{_libdir}/%{name}/presets/autotext
@@ -2913,54 +2941,178 @@ fi
  %{_libdir}/%{name}/presets/psprint
  
  %dir %{_libdir}/%{name}/program
  %{_libdir}/%{name}/presets/psprint
  
  %dir %{_libdir}/%{name}/program
-%attr(755,root,root) %{_libdir}/%{name}/program/basprov*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/cairocanvas.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/canvasfactory.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/cde-open-url
-%attr(755,root,root) %{_libdir}/%{name}/program/cmdmail.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/configmgr.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/desktopbe1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/dlgprov*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/fastsax.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/fpicker.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/fps_office.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/fsstorage.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/hatchwindowfactory.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/i18npool.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/i18nsearch.uno.so
+%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/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/liblocalebe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblosessioninstalllo.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/libnpsoplugin.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/libucpgio1lo.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/gengal
+%attr(755,root,root) %{_libdir}/%{name}/program/gengal.bin
+%attr(755,root,root) %{_libdir}/%{name}/program/gdbtrace
  %attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
  %attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
-%attr(755,root,root) %{_libdir}/%{name}/program/ldapbe2.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libavmediagst.so
+%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/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/libcollator_data.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libcomphelpgcc3.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}
  %{!?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/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/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/libembobj.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libemboleobj.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libfileacc.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/libfilelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfilterconfiglo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfirebird_sdbclo.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}
  %{!?with_system_hunspell:%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so}
-%attr(755,root,root) %{_libdir}/%{name}/program/libi18nisolang1gcc3.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libi18nutilgcc3.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/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/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/libmcnttype.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libmozbootstrap.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmorklo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmozbootstraplo.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/liboglcanvaslo.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/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/librecentfile.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/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/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/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/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/libtvhlp1.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libucb1.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libucbhelper4gcc3.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/libucpchelp1.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libucpdav1.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libucpfile1.so
@@ -2968,42 +3120,41 @@ fi
  %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/libucphier1.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libucppkg1.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libunopkgapp.so
-## maybe external is possible?
-# - external broken in 3.0.1
-###%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsec1*.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
  %attr(755,root,root) %{_libdir}/%{name}/program/libxmlsecurity.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/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/libxstor.so
-%attr(755,root,root) %{_libdir}/%{name}/program/localebe1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/migrationoo2.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/migrationoo3.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/msforms.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
  %attr(755,root,root) %{_libdir}/%{name}/program/open-url
  %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/pagein*
-%attr(755,root,root) %{_libdir}/%{name}/program/passwordcontainer.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/program/pluginapp.bin
  %attr(755,root,root) %{_libdir}/%{name}/program/pluginapp.bin
-## seems to be exactly the same as in -ure
-#%attr(755,root,root) %{_libdir}/%{name}/program/regcomp
-#%attr(755,root,root) %{_libdir}/%{name}/program/regcomp.bin
-##
  %attr(755,root,root) %{_libdir}/%{name}/program/senddoc
  %attr(755,root,root) %{_libdir}/%{name}/program/senddoc
-%attr(755,root,root) %{_libdir}/%{name}/program/simplecanvas.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/slideshow.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/program/spadmin.bin
  %attr(755,root,root) %{_libdir}/%{name}/program/spadmin.bin
-%attr(755,root,root) %{_libdir}/%{name}/program/stringresource*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/syssh.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/ucpexpand1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/ucpext.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/ucptdoc1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/updatefeed.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
  %attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
-%attr(755,root,root) %{_libdir}/%{name}/program/vbaevents*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/vclcanvas.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/xid-fullscreen-on-all-monitors
  
  %if %{with java}
  %attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
  
  %if %{with java}
  %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}
@@ -3016,45 +3167,45 @@ fi
  %{_libdir}/%{name}/program/cli_ure.dll
  %endif
  
  %{_libdir}/%{name}/program/cli_ure.dll
  %endif
  
-%{_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}
  %dir %{_libdir}/%{name}/program/classes
  %config(noreplace) %verify(not md5 mtime size) %{_libdir}/%{name}/program/unorc
  %{_libdir}/%{name}/program/versionrc
  
  %if %{with java}
  %dir %{_libdir}/%{name}/program/classes
-%{_libdir}/%{name}/program/classes/LuceneHelpWrapper.jar
+%{_libdir}/%{name}/program/classes/reportbuilder.jar
+%{_libdir}/%{name}/program/classes/reportbuilderwizard.jar
  %{_libdir}/%{name}/program/classes/ScriptFramework.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/ScriptProviderForJava.jar
  %{_libdir}/%{name}/program/classes/XMergeBridge.jar
-%{_libdir}/%{name}/program/classes/XSLTFilter.jar
-%{_libdir}/%{name}/program/classes/XSLTValidate.jar
-%{_libdir}/%{name}/program/classes/agenda.jar
  %{_libdir}/%{name}/program/classes/commonwizards.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/form.jar
  %{!?with_system_hsqldb:%{_libdir}/%{name}/program/classes/hsqldb.jar}
-%{_libdir}/%{name}/program/classes/letter.jar
+%{_libdir}/%{name}/program/classes/js.jar
  %{_libdir}/%{name}/program/classes/officebean.jar
  %{_libdir}/%{name}/program/classes/query.jar
  %{_libdir}/%{name}/program/classes/report.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
  %{_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
-%{_libdir}/%{name}/program/classes/web.jar
  %{!?with_system_xalan:%{_libdir}/%{name}/program/classes/xalan.jar}
  %{_libdir}/%{name}/program/classes/xmerge.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 %{_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
  
  %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/cuien-US.res
  %{_libdir}/%{name}/program/resource/chartcontrolleren-US.res
  %{_libdir}/%{name}/program/resource/dbaen-US.res
@@ -3076,8 +3227,8 @@ fi
  %{_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/ofaen-US.res
  %{_libdir}/%{name}/program/resource/pcren-US.res
  %{_libdir}/%{name}/program/resource/pdffilteren-US.res
-%{_libdir}/%{name}/program/resource/sanen-US.res
  %{_libdir}/%{name}/program/resource/sben-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/sden-US.res
  %{_libdir}/%{name}/program/resource/sdbten-US.res
  %{_libdir}/%{name}/program/resource/sfxen-US.res
@@ -3087,9 +3238,7 @@ fi
  %{_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/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/tplen-US.res
-%{_libdir}/%{name}/program/resource/updchken-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/upden-US.res
  %{_libdir}/%{name}/program/resource/uuien-US.res
  %{_libdir}/%{name}/program/resource/vclen-US.res
@@ -3098,6 +3247,8 @@ fi
  %{_libdir}/%{name}/program/resource/xsltdlgen-US.res
  
  %dir %{_libdir}/%{name}/share
  %{_libdir}/%{name}/program/resource/xsltdlgen-US.res
  
  %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
  %dir %{_libdir}/%{name}/share/Scripts
  %{_libdir}/%{name}/share/Scripts/beanshell
  %{_libdir}/%{name}/share/Scripts/javascript
@@ -3115,13 +3266,26 @@ fi
  %{_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_crystal.zip
  %{_libdir}/%{name}/share/config/images_hicontrast.zip
  %{_libdir}/%{name}/share/config/images_oxygen.zip
+%{_libdir}/%{name}/share/config/images_sifr.zip
  %{_libdir}/%{name}/share/config/images_tango.zip
  %{_libdir}/%{name}/share/config/images_tango.zip
-%{_libdir}/%{name}/share/config/javasettingsunopkginstall.xml
  %{_libdir}/%{name}/share/config/*.xpm
  %dir %{_libdir}/%{name}/share/config/soffice.cfg
  %{_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
  %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/dbapp
  %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
  %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbquery
@@ -3129,13 +3293,16 @@ fi
  %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
  %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/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/sweb
  %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/spropctrlr
  %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
  %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
@@ -3149,7 +3316,27 @@ fi
  %{_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
  %{_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
-%{_libdir}/%{name}/share/config/symbol
+%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/config/webcast
  %{_libdir}/%{name}/share/config/wizard
  %dir %{_libdir}/%{name}/share/dtd
@@ -3159,6 +3346,7 @@ fi
  %{_libdir}/%{name}/share/psprint
  
  %dir %{_libdir}/%{name}/share/registry
  %{_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/Langpack-en-US.xcd
  %{_libdir}/%{name}/share/registry/lingucomponent.xcd
  %{_libdir}/%{name}/share/registry/main.xcd
@@ -3167,19 +3355,24 @@ fi
  %dir %{_libdir}/%{name}/share/registry/res
  %{_libdir}/%{name}/share/registry/res/fcfg_langpack_en-US.xcd
  
  %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
  %dir %{_libdir}/%{name}/share/template
-%{_libdir}/%{name}/share/template/en-US
  %dir %{_libdir}/%{name}/share/template/common
  %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
  %{_libdir}/%{name}/share/template/common/layout
  %dir %{_libdir}/%{name}/share/template/wizard
  %{_libdir}/%{name}/share/template/wizard/bitmap
-%dir %{_libdir}/%{name}/share/template/wizard/letter
-%{_libdir}/%{name}/share/template/wizard/letter/en-US
+%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
  
  %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
  %{_libdir}/%{name}/share/xslt/common
@@ -3193,7 +3386,6 @@ fi
  # symlink to directory
  %attr(755,root,root) %{_libdir}/%{name}/ure-link
  
  # symlink to directory
  %attr(755,root,root) %{_libdir}/%{name}/ure-link
  
-%attr(755,root,root) %{_libdir}/%{name}/program/libnpsoplugin.so
  %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
@@ -3201,8 +3393,8 @@ 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/intro.png
  %{_libdir}/%{name}/program/redirectrc
  %{_libdir}/%{name}/program/setuprc
@@ -3215,17 +3407,19 @@ fi
  
  %dir %{_datadir}/%{name}/readmes
  %{_datadir}/%{name}/readmes/README_en-US
  
  %dir %{_datadir}/%{name}/readmes
  %{_datadir}/%{name}/readmes/README_en-US
-%{_libdir}/%{name}/share/config/images_brand.zip
  %dir %{_libdir}/%{name}/share/extensions
  %{_libdir}/%{name}/share/extensions/package.txt
  
  %{_datadir}/mime/packages/libreoffice.xml
  %{_iconsdir}/hicolor/*/mimetypes/libreoffice-*.png
  %dir %{_libdir}/%{name}/share/extensions
  %{_libdir}/%{name}/share/extensions/package.txt
  
  %{_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.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-main.svg
  
  
-%{_desktopdir}/libreoffice-qstart.desktop
  %{_desktopdir}/libreoffice-startcenter.desktop
  %{_desktopdir}/libreoffice-startcenter.desktop
+%{_desktopdir}/libreoffice-qstart.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
  %{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.svg
  
  %{_mandir}/man1/loffice.1
  %{_mandir}/man1/lofromtemplate.1
  
  %{_mandir}/man1/loffice.1
  %{_mandir}/man1/lofromtemplate.1
@@ -3248,19 +3442,20 @@ fi
  %files libs-kde
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libdir}/%{name}/program/kde-open-url
  %files libs-kde
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libdir}/%{name}/program/kde-open-url
-%attr(755,root,root) %{_libdir}/%{name}/program/fps_kde4.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/kde4be1.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde4*.so
  %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde4*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libkde4be1lo.so
  %endif
  
  %endif
  
+%if %{with gtk} || %{with gtk3}
  %files libs-gtk
  %defattr(644,root,root,755)
  %files libs-gtk
  %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/gconfbe1.uno.so
  %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/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/ucpgio1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libgconfbe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libqstart_gtklo.so
  %{_libdir}/%{name}/share/registry/gnome.xcd
  %{_libdir}/%{name}/share/registry/gnome.xcd
+%endif
  
  %files base
  %defattr(644,root,root,755)
  
  %files base
  %defattr(644,root,root,755)
@@ -3270,8 +3465,13 @@ fi
  %{_mandir}/man1/lobase.1
  %{_desktopdir}/libreoffice-base.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-base.png
  %{_mandir}/man1/lobase.1
  %{_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/abpen-US.res
-%{_libdir}/%{name}/program/resource/adabasuien-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/cnren-US.res
  %{_libdir}/%{name}/program/resource/dbpen-US.res
  %{_libdir}/%{name}/program/resource/dbuen-US.res
@@ -3290,11 +3490,11 @@ fi
  %{_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/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/dbreport/ui
  %{_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
  %{_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
-%{_datadir}/%{name}/help/en/sdatabase.*
  
  %files calc
  %defattr(644,root,root,755)
  
  %files calc
  %defattr(644,root,root,755)
@@ -3304,15 +3504,27 @@ fi
  %{_mandir}/man1/localc.1
  %{_desktopdir}/libreoffice-calc.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-calc.png
  %{_mandir}/man1/localc.1
  %{_desktopdir}/libreoffice-calc.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-calc.png
-%{_datadir}/%{name}/help/en/scalc.*
-%attr(755,root,root) %{_libdir}/%{name}/program/vbaobj.uno.so
+%{_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/libscopencllo.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/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}/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
  %{_libdir}/%{name}/share/registry/calc.xcd
  
  %files draw
@@ -3323,31 +3535,44 @@ fi
  %{_mandir}/man1/lodraw.1
  %{_desktopdir}/libreoffice-draw.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-draw.png
  %{_mandir}/man1/lodraw.1
  %{_desktopdir}/libreoffice-draw.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-draw.png
-%{_datadir}/%{name}/help/en/sdraw.*
+%{_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/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)
  %{_libdir}/%{name}/program/mailmerge.py*
  %{_libdir}/%{name}/share/registry/draw.xcd
  
  %files emailmerge
  %defattr(644,root,root,755)
  %{_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) %{_libdir}/%{name}/program/vbaswobj.uno.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
  %{_desktopdir}/libreoffice-writer.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-writer.png
  %attr(755,root,root) %{_libdir}/%{name}/program/swriter
  %{_mandir}/man1/lowriter.1
  %{_desktopdir}/libreoffice-writer.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-writer.png
-%{_datadir}/%{name}/help/en/swriter.*
+%{_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}/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
  %{_libdir}/%{name}/share/registry/writer.xcd
  
  %files impress
@@ -3355,16 +3580,22 @@ fi
  %attr(755,root,root) %{_bindir}/loimpress
  %attr(755,root,root) %{_bindir}/ooimpress
  %attr(755,root,root) %{_libdir}/%{name}/program/simpress
  %attr(755,root,root) %{_bindir}/loimpress
  %attr(755,root,root) %{_bindir}/ooimpress
  %attr(755,root,root) %{_libdir}/%{name}/program/simpress
-%attr(755,root,root) %{_libdir}/%{name}/program/OGLTrans.uno.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/libplaceware*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libPresentationMinimizerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libPresenterScreenlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwpftimpresslo.so
  %{_mandir}/man1/loimpress.1
  %{_desktopdir}/libreoffice-impress.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-impress.png
  %{_mandir}/man1/loimpress.1
  %{_desktopdir}/libreoffice-impress.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-impress.png
-%{_datadir}/%{name}/help/en/simpress.*
+%{_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/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
  
  %{_libdir}/%{name}/share/registry/impress.xcd
  %{_libdir}/%{name}/share/registry/ogltrans.xcd
  
@@ -3375,10 +3606,16 @@ fi
  %{_mandir}/man1/lomath.1
  %{_desktopdir}/libreoffice-math.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-math.png
  %{_mandir}/man1/lomath.1
  %{_desktopdir}/libreoffice-math.desktop
  %{_iconsdir}/hicolor/*/apps/libreoffice-math.png
-%{_datadir}/%{name}/help/en/smath.*
+%{_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
  %{_libdir}/%{name}/program/resource/smen-US.res
  %attr(755,root,root) %{_libdir}/%{name}/program/smath
  %{_libdir}/%{name}/program/resource/smen-US.res
-%{_libdir}/%{name}/share/config/soffice.cfg/modules/smath
+%{_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
  %{_libdir}/%{name}/share/registry/math.xcd
  
  %files web
@@ -3392,33 +3629,31 @@ fi
  
  %files graphicfilter
  %defattr(644,root,root,755)
  
  %files graphicfilter
  %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/libflashlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvgfilterlo.so
  %{_libdir}/%{name}/share/registry/graphicfilter.xcd
  %{_libdir}/%{name}/share/registry/graphicfilter.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/libgraphicfilterlo.so
  
  %files xsltfilter
  %defattr(644,root,root,755)
  %{_libdir}/%{name}/share/registry/xsltfilter.xcd
  %{_libdir}/%{name}/share/xslt/docbook
  %{_libdir}/%{name}/share/xslt/export/xhtml
  
  %files xsltfilter
  %defattr(644,root,root,755)
  %{_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)
-%{_libdir}/%{name}/program/classes/pexcel.jar
-%{_libdir}/%{name}/program/classes/pocketword.jar
-%{_libdir}/%{name}/program/classes/aportisdoc.jar
-%{_libdir}/%{name}/share/registry/palm.xcd
-%{_libdir}/%{name}/share/registry/pocketexcel.xcd
-%{_libdir}/%{name}/share/registry/pocketword.xcd
-%{_desktopdir}/libreoffice-javafilter.desktop
-%endif
+%files postgresql
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/program/postgresql-sdbc.ini
+%{_libdir}/%{name}/program/services/postgresql-sdbc.rdb
+%{_libdir}/%{name}/share/registry/postgresql.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/regmerge
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/regview
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/startup.sh
@@ -3428,46 +3663,44 @@ fi
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/javaldx
  %endif
  %dir %{_libdir}/%{name}/ure/lib
  %attr(755,root,root) %{_libdir}/%{name}/ure/bin/javaldx
  %endif
  %dir %{_libdir}/%{name}/ure/lib
-%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/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/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/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/libbinaryurplo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libbootstraplo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libgcc3_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libintrospectionlo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libinvocadaptlo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libinvocationlo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libiolo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmaccesslo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmfwklo.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/liblog_uno_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/libuno_cppu.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libnamingservicelo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libproxyfaclo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libreflectionlo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libreglo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libsal_textenclo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libstocserviceslo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libstorelo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libsunjavapluginlo.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppuhelpergcc3.so.3
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppuhelpergcc3.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppu.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunoidllo.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_purpenvhelpergcc3.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_salhelpergcc3.so.3
-%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/binaryurp.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libxmlreader.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_sal.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunsafe_uno_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuuresolverlo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libxmlreaderlo.so
  %{_libdir}/%{name}/ure/lib/jvmfwk3rc
  %{_libdir}/%{name}/ure/lib/unorc
  %if %{with java}
  %{_libdir}/%{name}/ure/lib/jvmfwk3rc
  %{_libdir}/%{name}/ure/lib/unorc
  %if %{with java}
+%{_libdir}/%{name}/ure/lib/JREProperties.class
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjavaloaderlo.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjava_uno.so
  %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjava_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjavavmlo.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjpipe.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/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
-%{_libdir}/%{name}/ure/lib/JREProperties.class
  %endif
  %dir %{_libdir}/%{name}/ure/share
  %if %{with java}
  %endif
  %dir %{_libdir}/%{name}/ure/share
  %if %{with java}
@@ -3488,69 +3721,97 @@ fi
  %files pyuno
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libdir}/%{name}/program/libpyuno.so
  %files pyuno
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libdir}/%{name}/program/libpyuno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/pythonloader.uno.so
  %attr(755,root,root) %{_libdir}/%{name}/program/pyuno.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/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/uno.py
  %{_libdir}/%{name}/program/unohelper.py
+%{_libdir}/%{name}/program/services/pyuno.rdb
+%{_libdir}/%{name}/program/services/scriptproviderforpython.rdb
+%{_libdir}/%{name}/share/registry/librelogo.xcd
  %{_libdir}/%{name}/share/registry/pyuno.xcd
  
  %{_libdir}/%{name}/share/registry/pyuno.xcd
  
+# 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
  %{_libdir}/%{name}/share/Scripts/python
  
  %files pdfimport
  # samples there
  %{_libdir}/%{name}/share/Scripts/python
  
  %files pdfimport
-%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/images
-%{_libdir}/%{name}/share/extensions/pdfimport/registration
-%{_libdir}/%{name}/share/extensions/pdfimport/*.xcu
-%{_libdir}/%{name}/share/extensions/pdfimport/*.pdf
-
-%files presentation-minimizer
-%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/description.xml
-%{_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
+# -f pdfimport.lang
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/program/xpdfimport
+%{_libdir}/%{name}/share/registry/pdfimport.xcd
+%{_libdir}/%{name}/share/xpdfimport
+%{_libdir}/%{name}/program/libpdfimportlo.so
+
+%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
+%dir %{_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
+%dir %{_libdir}/%{name}/share/extensions/nlpsolver/help
+%dir %{_libdir}/%{name}/share/extensions/nlpsolver/locale
+%{_libdir}/%{name}/share/extensions/nlpsolver/locale/*_en_US.default
+%{_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) %{_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)
  
@@ -3569,6 +3830,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)
  
@@ -3584,7 +3848,7 @@ fi
  %files i18n-ca -f ca.lang
  %defattr(644,root,root,755)
  
  %files i18n-ca -f ca.lang
  %defattr(644,root,root,755)
  
-%files i18n-ca_XV -f ca_XV.lang
+%files i18n-ca_XV -f ca_valencia.lang
  %defattr(644,root,root,755)
  
  %files i18n-cs -f cs.lang
  %defattr(644,root,root,755)
  
  %files i18n-cs -f cs.lang
@@ -3693,7 +3957,7 @@ fi
  %files i18n-ks -f ks.lang
  %defattr(644,root,root,755)
  
  %files i18n-ks -f ks.lang
  %defattr(644,root,root,755)
  
-%files i18n-ku -f ku.lang
+%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
@@ -3783,10 +4047,10 @@ fi
  %files i18n-sd -f sd.lang
  %defattr(644,root,root,755)
  
  %files i18n-sd -f sd.lang
  %defattr(644,root,root,755)
  
-%files i18n-sh -f sh.lang
+%files i18n-si -f si.lang
  %defattr(644,root,root,755)
  
  %defattr(644,root,root,755)
  
-%files i18n-si -f si.lang
+%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
@@ -3834,6 +4098,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)
  
@@ -3865,3 +4132,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