X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libreoffice.spec;h=b4db0adeafc96e46b4a2b76ed734093144aa8cd7;hb=2b5df9aed7eed902af4fc58851f36f77f239ef4e;hp=09b1d6db99c4850995a78f272a82d0d6b24f78ef;hpb=19effc321d8b794efeb6def35ed266481c834b73;p=packages%2Flibreoffice.git

diff --git a/libreoffice.spec b/libreoffice.spec
index 09b1d6d..b4db0ad 100644
--- 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
@@ -38,50 +41,44 @@
 %undefine	with_system_hsqldb
 %endif
 
-%define		major_ver		3.5.4
+%define		major_ver		4.1.0
 
 Summary:	LibreOffice - powerful office suite
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
-Version:	%{major_ver}.2
-Release:	4
+Version:	%{major_ver}.4
+Release:	2
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
 # git clone git://anongit.freedesktop.org/git/libreoffice/build
 # cd build
 # git checkout -b libreoffice-3-3 origin/libreoffice-3-3
-Source0:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-core-%{version}.tar.xz
-# Source0-md5:	61afc900785dd7d071b96d9ab0af46f3
-Source1:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-binfilter-%{version}.tar.xz
-# Source1-md5:	e0ea910f2a6fbe1dbe44e437c89b8cd7
-Source2:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source2-md5:	f5b21e92bebabffe634aabb4e36cdd87
-Source3:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source3-md5:	d2e7414a60eacafef45fbc4bc1a8ccb3
-Source4:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source4-md5:	545d1608da2cc736be5c8bf941adbbfb
-
-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
+Source0:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
+# Source0-md5:	5311656e1b54eadd4b93f948dfd5e68e
+Source1:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
+# Source1-md5:	2bbe7adab2b9bc0042c72ba60c30acc4
+Source2:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
+# Source2-md5:	e2cd3b63e3050771a1330fc98e41a701
+Source3:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
+# Source3-md5:	1f4438828cbcf83c257742482dade3ef
+
+Source20:       http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+# Source20-md5:	0168229624cfac409e766913506961a8
+Source21:	http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+# Source21-md5:	17410483b5b5f267aa18b7e00b65e6e0
+Source22:	http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+# Source22-md5:	1f24ab1d39f4a51faf22244c94a6203f
+Source23:	http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+# Source23-md5:	798b2ffdc8bcfe7bca2cf92b62caf685
+Source24:	http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+# Source24-md5:	35c94d2df8893241173de1d16b6034c0
+Source25:	http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+# Source25-md5:	a7983f859eafb2677d7ff386a023bc40
+
 Patch0:		%{name}-hamcrest.patch
-Patch1:		%{name}-libexttextcat.patch
+Patch1:		%{name}-mdds.patch
+Patch2:		%{name}-md5.patch
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
@@ -94,9 +91,11 @@ BuildRequires:	autoconf >= 2.51
 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:	clucene-core-devel >= 2.3
 BuildRequires:	cppunit-devel >= 1.12.0
 BuildRequires:	cups-devel
 BuildRequires:	curl-devel >= 7.9.8
@@ -109,9 +108,10 @@ BuildRequires:	freetype-devel >= 2.1
 BuildRequires:	glib2-devel >= 2.13.5
 BuildRequires:	gperf
 BuildRequires:	graphite2-devel
-BuildRequires:	gstreamer-devel >= 0.10.0
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
+BuildRequires:	gstreamer0.10-devel >= 0.10.0
+BuildRequires:	gstreamer0.10-plugins-base-devel >= 0.10.0
 BuildRequires:	gtk+2-devel >= 2:2.10
+BuildRequires:	harfbuzz-icu-devel
 %{?with_system_hunspell:BuildRequires:	hunspell-devel >=1.2.2}
 BuildRequires:	hyphen-devel
 %{?with_icecream:BuildRequires:	icecream}
@@ -128,7 +128,12 @@ BuildRequires:	java-junit
 BuildRequires:	java-lucene
 BuildRequires:	java-lucene-contrib
 BuildRequires:	java-servletapi
-BuildRequires:	libcmis-devel
+BuildRequires:	libcmis-devel >= 0.3
+BuildRequires:	liblangtag-devel
+BuildRequires:	libmspub-devel
+BuildRequires:	libmwaw-devel
+BuildRequires:	libodfgen-devel
+BuildRequires:	liborcus-devel >= 0.4
 BuildRequires:	libvisio-devel
 BuildRequires:	libwpd-devel >= 0.9.0
 BuildRequires:	libwpg-devel >= 0.2.0
@@ -146,6 +151,7 @@ BuildRequires:	java-libxml
 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
@@ -158,7 +164,7 @@ BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-devel
 BuildRequires:	libxslt-progs
 %{?with_access:%{?with_system_mdbtools:BuildRequires:	mdbtools-devel >= 0.6}}
-BuildRequires:	mdds-devel
+BuildRequires:	mdds-devel >= 0.9.0
 %{?with_mono:BuildRequires:	mono-csharp >= 1.2.3}
 %{?with_mono:BuildRequires:	mono-static >= 1.2.3}
 %{?with_system_myspell:BuildRequires:	myspell-devel}
@@ -178,12 +184,12 @@ BuildRequires:	postgresql-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:	rpmbuild(macros) >= 1.357
+BuildRequires:	rpmbuild(macros) >= 1.660
 BuildRequires:	sablotron-devel
 BuildRequires:	sane-backends-devel
 BuildRequires:	saxon
@@ -217,14 +223,11 @@ Requires:	%{name}-draw = %{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}-postgresql = %{version}-%{release}
 Requires:	%{name}-presentation-minimizer = %{version}-%{release}
-Requires:	%{name}-presenter-screen = %{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}
@@ -236,6 +239,9 @@ ExclusiveArch:	%{ix86} %{x8664} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing -O2
+%define		filterout_c	-fomit-frame-pointer
+%define		filterout_cpp	-fomit-frame-pointer
+%define		filterout_cxx	-fomit-frame-pointer
 
 # No ELF objects there to strip/chrpath, skips processing:
 # - share/ - 17000 files of 415M
@@ -325,6 +331,9 @@ Requires:	saxon
 Requires:	sed
 %{?with_system_xalan:Requires:	xalan-j}
 #Suggests:	chkfontpath
+Obsoletes:	libreoffice-binfilter < 4.0.0.0
+Obsoletes:	libreoffice-report-builder < 4.1.0.0
+Obsoletes:	libreoffice-javafilter < 4.1.0.0
 Obsoletes:	libreoffice-i18n-kid
 Obsoletes:	libreoffice-i18n-ky
 Obsoletes:	libreoffice-i18n-ms
@@ -353,7 +362,6 @@ Obsoletes:	openoffice-libs
 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
@@ -432,27 +440,6 @@ The Presentation Minimizer is used to reduce the file size of the
 current presentation. Images will be compressed, and data that is no
 longer needed will be removed.
 
-%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
@@ -573,6 +560,7 @@ Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name}-core = %{version}-%{release}
 Requires:	hicolor-icon-theme
 Obsoletes:	openoffice.org-impress
+Obsoletes:	libreoffice-presenter-screen < 4.0.0.0-1
 
 %description impress
 Presentation application of LibreOffice.
@@ -627,22 +615,6 @@ Moduł xsltfilter dla LibreOffice, udostępnia dodatkowe przekształcenia
 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
-Group:		X11/Applications
-Requires(post,postun):	desktop-file-utils
-Requires:	%{name}-core = %{version}-%{release}
-Obsoletes:	openoffice.org-javafilter
-
-%description javafilter
-javafilter module for LibreOffice, provides additional aportisdoc,
-Pocket Excel and Pocket Word import filters.
-
-%description javafilter -l pl.UTF-8
-Moduł javafilter dla LibreOffice, udostępnia dodatkowe filtry importu
-aportisdoc, Pocket Excel i Pocket Word.
-
 %package postgresql
 Summary:	PostgreSQL connector for LibreOffice
 Group:		X11/Applications
@@ -653,6 +625,18 @@ Requires:	postgresql-libs
 A PostgreSQL connector for the database front-end for LibreOffice.
 Allows creation and management of PostgreSQL databases through a GUI.
 
+%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
 Summary:	UNO Runtime Environment
@@ -706,6 +690,20 @@ Afrikaans language.
 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
@@ -789,6 +787,21 @@ Bulgarian language.
 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
@@ -2047,6 +2060,20 @@ Sinhala language.
 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
@@ -2474,11 +2501,23 @@ bash-completion for 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
-%setup -q -n %{name}-core-%{version} -a1 -a2 -a3 -a4
+%setup -q -n %{name}-%{version} -a1 -a2 -a3
 
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 for dir in *-%{version}; do
 	[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -2488,14 +2527,11 @@ done
 
 install -d ext_sources
 ln %{SOURCE20} ext_sources
+ln %{SOURCE21} ext_sources
+ln %{SOURCE22} ext_sources
 ln %{SOURCE23} ext_sources
 ln %{SOURCE24} ext_sources
 ln %{SOURCE25} ext_sources
-ln %{SOURCE26} ext_sources
-ln %{SOURCE27} ext_sources
-ln %{SOURCE28} ext_sources
-ln %{SOURCE29} ext_sources
-ln %{SOURCE30} ext_sources
 :> src.downloaded
 
 %build
@@ -2509,7 +2545,7 @@ fi
 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"
@@ -2545,12 +2581,13 @@ RPM_BUILD_NR_THREADS=$(echo %{_smp_mflags} | cut -dj -f2)
 RPM_BUILD_NR_THREADS="1"
 %endif
 
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 touch autogen.lastrun
 
 %configure \
-	--with-num-cpus=$RPM_BUILD_NR_THREADS \
+	--enable-release-build \
+	--with-parallelism=$RPM_BUILD_NR_THREADS \
 	--with-max-jobs=1 \
 	--with-unix-wrapper=%{name} \
 	--disable-odk \
@@ -2594,17 +2631,18 @@ touch autogen.lastrun
 	--with-system-zlib \
 	--with-system-libexttextcat \
 	--with-system-jfreereport \
+	--enable-vba \
 	--with-vba-package-format="builtin" \
 	--with-system-libs \
 	--with-system-headers \
 	--with-system-mythes \
-	--with-system-dicts \
 	--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-nlpsolver \
 	--enable-ext-pdfimport \
 	--enable-ext-wiki-publisher \
 	--enable-ext-report-builder \
@@ -2665,16 +2703,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"
 
-# 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
@@ -2693,26 +2721,6 @@ if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
 	%{__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
@@ -2759,10 +2767,6 @@ if [ ! -f installed.stamp ]; then
 		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
 
@@ -2829,13 +2833,16 @@ find_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}$" ${lfile} >> ${langfn}.lang || :
+		grep "/soffice.cfg/[^/]*/ui/res/${lang}/" ${lfile} >> ${langfn}.lang || :
+		grep "/soffice.cfg/modules/[^/]*/ui/res/${lang}$" ${lfile} >> ${langfn}.lang || :
+		grep "/soffice.cfg/modules/[^/]*/ui/res/${lang}/" ${lfile} >> ${langfn}.lang || :
 
-		for e in pdfimport \
-				presentation-minimizer \
-				presenter-screen \
-				report-builder \
+		for e in presentation-minimizer \
 				script-provider-for-python \
-				wiki-publisher ; do
+				wiki-publisher \
+				nlpsolver ; do
 			for d in $RPM_BUILD_ROOT%{_libdir}/%{name}/share/extensions/$e/description-${lang}.txt ; do
 				[ -f $d ] && echo "%lang(${lang}) $d" | sed -e "s|$RPM_BUILD_ROOT||g" >> $e.lang || :
 			done
@@ -2858,7 +2865,7 @@ done
 %endif
 
 # Fix incorrect file list, help files listed but not installed
-for l in lb; do
+for l in lb bn_IN; do
 	%{__sed} -i -e '/.*\/help\/.*/d' $l.lang
 done
 
@@ -2936,12 +2943,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
@@ -2960,7 +2961,7 @@ fi
 %defattr(644,root,root,755)
 %doc %{_libdir}/%{name}/CREDITS*
 %doc %{_libdir}/%{name}/LICENSE*
-%doc %{_libdir}/%{name}/*README*
+#%doc %{_libdir}/%{name}/*README*
 
 %attr(755,root,root) %{_bindir}/libreoffice
 %attr(755,root,root) %{_bindir}/lofromtemplate
@@ -2974,12 +2975,6 @@ fi
 %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
@@ -2993,28 +2988,46 @@ fi
 %{_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/libbasprovlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcairocanvaslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcanvasfactorylo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcmdmaillo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libconfigmgrlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdesktopbe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdlgprovlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libexpwraplo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfastsaxlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfpickerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfps_officelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libfsstoragelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhatchwindowfactorylo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18npoollo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libi18nsearchlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libldapbe2lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblosessioninstalllo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblocalebe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmtfrendererlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmigrationoo2lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmigrationoo3lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmsformslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpasswordcontainerlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsimplecanvaslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libslideshowlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libstringresourcelo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsysshlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpcmis1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpexpand1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpextlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucptdoc1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libupdatefeedlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbaeventslo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclcanvaslo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/cde-open-url
-%attr(755,root,root) %{_libdir}/%{name}/program/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/expwrap.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/gengal
 %attr(755,root,root) %{_libdir}/%{name}/program/gengal.bin
-%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/java-set-classpath
-%attr(755,root,root) %{_libdir}/%{name}/program/ldapbe2.uno.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/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
@@ -3023,11 +3036,8 @@ fi
 %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/libchartmodello.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libcharttoolslo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libchartviewlo.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/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
@@ -3045,7 +3055,6 @@ fi
 %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/libdoctoklo.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
@@ -3077,10 +3086,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libhelplinkerlo.so
 %{!?with_system_hunspell:%attr(755,root,root) %{_libdir}/%{name}/program/libhunspell.so}
 %attr(755,root,root) %{_libdir}/%{name}/program/libhyphenlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libi18nisolang1gcc3.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libi18npaperlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libi18nregexplo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libi18nutilgcc3.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
@@ -3102,6 +3109,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_others.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libloglo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmcnttype.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmorklo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmozbootstrap.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmsfilterlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmysqllo.so
@@ -3109,9 +3117,7 @@ fi
 %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/liboooimprovecorelo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libooxlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libooxmllo.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
@@ -3120,8 +3126,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libqstart_gtklo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/librecentfile.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libreslo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libresourcemodello.so
-%attr(755,root,root) %{_libdir}/%{name}/program/librtftoklo.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
@@ -3140,18 +3145,20 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libspl_unxlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libspllo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsrtrs1.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libsvgiolo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsvllo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsvtlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsvxcorelo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsvxlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libswlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtextfdlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libtextconv_dict.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libtextconversiondlgslo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libtklo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libtllo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libtvhlp1.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libucb1.so
-%attr(755,root,root) %{_libdir}/%{name}/program/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
@@ -3161,22 +3168,22 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libunopkgapp.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libunordflo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libunoxmllo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libupdchklo.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/libxcrlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwpftdrawlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libxmlfalo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libxmlfdlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlscriptlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcomphelper.so
 ## maybe external is possible?
 # - external broken in 3.0.1
 ###%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsec1*.so
 ##
 %attr(755,root,root) %{_libdir}/%{name}/program/libxmlsecurity.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libxmxlo.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
@@ -3184,34 +3191,17 @@ fi
 %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/localebe1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/mtfrenderer.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/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/passwordcontainer.uno.so
 %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/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/stringresource*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/syssh.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/ucpcmis1.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/vbaevents*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/vclcanvas.uno.so
 
 %if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
@@ -3237,30 +3227,29 @@ fi
 
 %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/ScriptProviderForBeanShell.jar
 %{_libdir}/%{name}/program/classes/ScriptProviderForJavaScript.jar
 %{_libdir}/%{name}/program/classes/ScriptProviderForJava.jar
 %{_libdir}/%{name}/program/classes/XMergeBridge.jar
-%{_libdir}/%{name}/program/classes/XSLTFilter.jar
-%{_libdir}/%{name}/program/classes/XSLTValidate.jar
-%{_libdir}/%{name}/program/classes/agenda.jar
+#%{_libdir}/%{name}/program/classes/XSLTFilter.jar
+#%{_libdir}/%{name}/program/classes/XSLTValidate.jar
 %{_libdir}/%{name}/program/classes/commonwizards.jar
-%{_libdir}/%{name}/program/classes/fax.jar
+#%{_libdir}/%{name}/program/classes/fax.jar
 %{_libdir}/%{name}/program/classes/form.jar
 %{!?with_system_hsqldb:%{_libdir}/%{name}/program/classes/hsqldb.jar}
 %{_libdir}/%{name}/program/classes/js.jar
-%{_libdir}/%{name}/program/classes/letter.jar
+#%{_libdir}/%{name}/program/classes/letter.jar
 %{_libdir}/%{name}/program/classes/officebean.jar
 %{_libdir}/%{name}/program/classes/query.jar
 %{_libdir}/%{name}/program/classes/report.jar
-%{_libdir}/%{name}/program/classes/saxon9.jar
+#%{_libdir}/%{name}/program/classes/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/web.jar
 %{!?with_system_xalan:%{_libdir}/%{name}/program/classes/xalan.jar}
 %{_libdir}/%{name}/program/classes/xmerge.jar
 %{_libdir}/%{name}/program/services/scriptproviderforbeanshell.rdb
@@ -3277,7 +3266,7 @@ fi
 %{_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/calen-US.res
 %{_libdir}/%{name}/program/resource/cuien-US.res
 %{_libdir}/%{name}/program/resource/chartcontrolleren-US.res
 %{_libdir}/%{name}/program/resource/dbaen-US.res
@@ -3299,8 +3288,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/sanen-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
@@ -3312,15 +3301,17 @@ fi
 %{_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/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/wzien-US.res
 %{_libdir}/%{name}/program/resource/xmlsecen-US.res
 %{_libdir}/%{name}/program/resource/xsltdlgen-US.res
+%{_libdir}/%{name}/program/tde-open-url
 
 %dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/labels
+%{_libdir}/%{name}/share/labels/labels.xml
 %dir %{_libdir}/%{name}/share/Scripts
 %{_libdir}/%{name}/share/Scripts/beanshell
 %{_libdir}/%{name}/share/Scripts/javascript
@@ -3339,12 +3330,24 @@ fi
 %{_libdir}/%{name}/share/config/images_hicontrast.zip
 %{_libdir}/%{name}/share/config/images_oxygen.zip
 %{_libdir}/%{name}/share/config/images_tango.zip
-%{_libdir}/%{name}/share/config/javasettingsunopkginstall.xml
 %{_libdir}/%{name}/share/config/*.xpm
 %dir %{_libdir}/%{name}/share/config/soffice.cfg
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/cui
+%{_libdir}/%{name}/share/config/soffice.cfg/cui/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/cui/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/dbaccess
+%{_libdir}/%{name}/share/config/soffice.cfg/dbaccess/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/dbaccess/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/desktop
+%{_libdir}/%{name}/share/config/soffice.cfg/desktop/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/desktop/ui/res/*
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/filter
+%{_libdir}/%{name}/share/config/soffice.cfg/filter/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/filter/ui/res/*
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/BasicIDE
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/StartModule
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/BasicIDE/ui/res/*
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbapp
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/dbquery
@@ -3352,11 +3355,13 @@ 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
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/schart/ui/res/*
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal/menubar
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal/statusbar
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/sglobal/toolbar
+%dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/smath
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/sweb
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/simpress
 %dir %{_libdir}/%{name}/share/config/soffice.cfg/modules/swform
@@ -3372,7 +3377,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/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
@@ -3382,6 +3407,7 @@ fi
 %{_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
@@ -3390,17 +3416,22 @@ fi
 %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/samples
+#%dir %{_libdir}/%{name}/share/samples/en-US
 
 %dir %{_libdir}/%{name}/share/template
-%{_libdir}/%{name}/share/template/en-US
+#%{_libdir}/%{name}/share/template/en-US
 %dir %{_libdir}/%{name}/share/template/common
+%{_libdir}/%{name}/share/template/common/internal
 %{_libdir}/%{name}/share/template/common/layout
 %dir %{_libdir}/%{name}/share/template/wizard
 %{_libdir}/%{name}/share/template/wizard/bitmap
-%dir %{_libdir}/%{name}/share/template/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
 %{_libdir}/%{name}/share/wordbook/en-GB.dic
@@ -3428,8 +3459,8 @@ fi
 %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/about.png
 %{_libdir}/%{name}/program/intro.png
 %{_libdir}/%{name}/program/redirectrc
 %{_libdir}/%{name}/program/setuprc
@@ -3442,17 +3473,19 @@ fi
 
 %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
+%{_iconsdir}/hicolor/*/mimetypes/libreoffice-*.svg
 %{_iconsdir}/hicolor/*/apps/libreoffice-main.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-main.svg
 
 %{_desktopdir}/libreoffice-qstart.desktop
 %{_desktopdir}/libreoffice-startcenter.desktop
 %{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
+%{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.svg
 
 %{_mandir}/man1/loffice.1
 %{_mandir}/man1/lofromtemplate.1
@@ -3475,18 +3508,17 @@ fi
 %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/libkde4be1lo.so
 %endif
 
 %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/ucpgio1.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libgconfbe1lo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucpgio1lo.so
 %{_libdir}/%{name}/share/registry/gnome.xcd
 
 %files base
@@ -3497,14 +3529,13 @@ fi
 %{_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/libadabasuilo.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/adabasuien-US.res
 %{_libdir}/%{name}/program/resource/cnren-US.res
 %{_libdir}/%{name}/program/resource/dbpen-US.res
 %{_libdir}/%{name}/program/resource/dbuen-US.res
@@ -3527,7 +3558,6 @@ fi
 %{_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)
@@ -3537,7 +3567,7 @@ fi
 %{_mandir}/man1/localc.1
 %{_desktopdir}/libreoffice-calc.desktop
 %{_iconsdir}/hicolor/*/apps/libreoffice-calc.png
-%{_datadir}/%{name}/help/en/scalc.*
+%{_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
@@ -3546,14 +3576,17 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libsclo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libscuilo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsolverlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/vbaobj.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbaobjlo.so
 %{_libdir}/%{name}/program/resource/analysisen-US.res
 %{_libdir}/%{name}/program/resource/dateen-US.res
+%{_libdir}/%{name}/program/resource/pricingen-US.res
 %{_libdir}/%{name}/program/resource/solveren-US.res
 %{_libdir}/%{name}/program/resource/scen-US.res
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/menubar
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/statusbar
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/toolbar
+%{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/scalc/ui/res/*
 %{_libdir}/%{name}/share/registry/calc.xcd
 
 %files draw
@@ -3564,10 +3597,12 @@ fi
 %{_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/ui
+%exclude %{_libdir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui/res/*
 %{_libdir}/%{name}/share/registry/draw.xcd
 
 %files emailmerge
@@ -3582,23 +3617,24 @@ fi
 %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/libmsworkslo.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/libwpftlo.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/vbaswobj.uno.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
-%{_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}/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
@@ -3606,17 +3642,20 @@ 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) %{_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/libPresenterScreenlo.so
 %{_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/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
 
@@ -3627,12 +3666,16 @@ fi
 %{_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
-%{_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
@@ -3648,43 +3691,30 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/program/libflashlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsvgfilterlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libwpgimportlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libvisioimportlo.so
 %{_libdir}/%{name}/share/registry/graphicfilter.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/libgraphicfilterlo.so
+%{_libdir}/%{name}/program/resource/flashen-US.res
 
 %files xsltfilter
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/share/registry/xsltfilter.xcd
 %{_libdir}/%{name}/share/xslt/docbook
 %{_libdir}/%{name}/share/xslt/export/xhtml
-
-%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
+%{_desktopdir}/libreoffice-xsltfilter.desktop
 
 %files postgresql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/postgresql-sdbc.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/postgresql-sdbc-impl.uno.so
 %{_libdir}/%{name}/program/postgresql-sdbc.ini
 %{_libdir}/%{name}/program/services/postgresql-sdbc.rdb
 %{_libdir}/%{name}/share/registry/postgresqlsdbc.xcd
+%attr(755,root,root) %{_libdir}/%{name}/program/libpostgresql-sdbclo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpostgresql-sdbc-impllo.so
 
 %files ure
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/ure
 %dir %{_libdir}/%{name}/ure/bin
-%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
@@ -3694,6 +3724,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/ure/bin/javaldx
 %endif
 %dir %{_libdir}/%{name}/ure/lib
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunoidl.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/namingservice.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libaffine_uno_uno.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/bootstrap.uno.so
@@ -3710,7 +3741,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/uuresolver.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/liblog_uno_uno.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libsal_textenc.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libstore.so.3
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libsunjavaplugin.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppu.so.3
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_cppuhelpergcc3.so.3
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libuno_purpenvhelpergcc3.so.3
@@ -3719,18 +3750,18 @@ fi
 %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/libjvmaccess.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjvmfwk.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libreg.so
+%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libstore.so
 %{_libdir}/%{name}/ure/lib/jvmfwk3rc
 %{_libdir}/%{name}/ure/lib/unorc
 %if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjava_uno.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjuh.so
 %attr(755,root,root) %{_libdir}/%{name}/ure/lib/libjuhx.so
-%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
@@ -3752,57 +3783,66 @@ fi
 %{_libdir}/%{name}/ure/share/misc/javavendors.xml
 %endif
 
-%files pyuno -f script-provider-for-python.lang
+%files pyuno
+# -f script-provider-for-python.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/program/libpyuno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/pythonloader.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/pyuno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libpythonloaderlo.so
 %{_libdir}/%{name}/program/pythonloader.unorc
 %{_libdir}/%{name}/program/officehelper.py
 %{_libdir}/%{name}/program/pythonloader.py
+%{_libdir}/%{name}/program/pythonscript.py
 %{_libdir}/%{name}/program/uno.py
 %{_libdir}/%{name}/program/unohelper.py
+%{_libdir}/%{name}/program/services/scriptproviderforpython.rdb
+%{_libdir}/%{name}/share/registry/librelogo.xcd
 %{_libdir}/%{name}/share/registry/pyuno.xcd
 
 # script-provider-for-python extension
-%dir %{_libdir}/%{name}/share/extensions/script-provider-for-python
-%{_libdir}/%{name}/share/extensions/script-provider-for-python/META-INF
-%{_libdir}/%{name}/share/extensions/script-provider-for-python/components.rdb
-%{_libdir}/%{name}/share/extensions/script-provider-for-python/description.xml
-%{_libdir}/%{name}/share/extensions/script-provider-for-python/*.py
-%{_libdir}/%{name}/share/extensions/script-provider-for-python/registration
+#%dir %{_libdir}/%{name}/share/extensions/script-provider-for-python
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/META-INF
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/components.rdb
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/description.xml
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/*.py
+#%{_libdir}/%{name}/share/extensions/script-provider-for-python/registration
 
 # python wizards
 %dir %{_libdir}/%{name}/program/wizards
 %{_libdir}/%{name}/program/wizards/*.py
+%dir %{_libdir}/%{name}/program/wizards/agenda
+%{_libdir}/%{name}/program/wizards/agenda/*.py
 %dir %{_libdir}/%{name}/program/wizards/common
 %{_libdir}/%{name}/program/wizards/common/*.py
 %dir %{_libdir}/%{name}/program/wizards/document
 %{_libdir}/%{name}/program/wizards/document/*.py
 %dir %{_libdir}/%{name}/program/wizards/fax
 %{_libdir}/%{name}/program/wizards/fax/*.py
+%dir %{_libdir}/%{name}/program/wizards/letter
+%{_libdir}/%{name}/program/wizards/letter/*.py
 %dir %{_libdir}/%{name}/program/wizards/text
 %{_libdir}/%{name}/program/wizards/text/*.py
 %dir %{_libdir}/%{name}/program/wizards/ui
 %{_libdir}/%{name}/program/wizards/ui/*.py
 %dir %{_libdir}/%{name}/program/wizards/ui/event
 %{_libdir}/%{name}/program/wizards/ui/event/*.py
+%dir %{_libdir}/%{name}/program/wizards/web
+%{_libdir}/%{name}/program/wizards/web/*.py
+%dir %{_libdir}/%{name}/program/wizards/web/data
+%{_libdir}/%{name}/program/wizards/web/data/*.py
+%dir %{_libdir}/%{name}/program/wizards/web/export
+%{_libdir}/%{name}/program/wizards/web/export/*.py
 
 # samples there
 %{_libdir}/%{name}/share/Scripts/python
 
-%files pdfimport -f pdfimport.lang
+%files pdfimport
+# -f pdfimport.lang
 %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
+%{_libdir}/%{name}/program/xpdfimport
+%{_libdir}/%{name}/share/registry/pdfimport.xcd
+%{_libdir}/%{name}/share/xpdfimport
+%{_libdir}/%{name}/program/libpdfimportlo.so
 
 %files presentation-minimizer -f presentation-minimizer.lang
 %defattr(644,root,root,755)
@@ -3810,33 +3850,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/share/extensions/presentation-minimizer/SunPresentationMinimizer.uno.so
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/META-INF
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/bitmaps
+%{_libdir}/%{name}/share/extensions/presentation-minimizer/components.rdb
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/description.xml
 %{_libdir}/%{name}/share/extensions/presentation-minimizer/registr*
 
-%files presenter-screen -f presenter-screen.lang
-%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 -f report-builder.lang
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/share/extensions/report-builder
-%{_libdir}/%{name}/share/extensions/report-builder/META-INF
-%{_libdir}/%{name}/share/extensions/report-builder/images
-%{_libdir}/%{name}/share/extensions/report-builder/registration
-%{_libdir}/%{name}/share/extensions/report-builder/registry
-%{_libdir}/%{name}/share/extensions/report-builder/template
-%{_libdir}/%{name}/share/extensions/report-builder/THIRDPARTYREADMELICENSE.html
-%{_libdir}/%{name}/share/extensions/report-builder/components.rdb
-%{_libdir}/%{name}/share/extensions/report-builder/description.xml
-%{_libdir}/%{name}/share/extensions/report-builder/readme*
-%{_libdir}/%{name}/share/extensions/report-builder/*.jar
-
 %files wiki-publisher -f wiki-publisher.lang
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/share/extensions/wiki-publisher
@@ -3852,6 +3869,18 @@ fi
 %{_libdir}/%{name}/share/extensions/wiki-publisher/description.xml
 %{_libdir}/%{name}/share/extensions/wiki-publisher/mediawiki.jar
 
+%files nlpsolver -f nlpsolver.lang
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/share/extensions/nlpsolver
+%{_libdir}/%{name}/share/extensions/nlpsolver/META-INF
+%{_libdir}/%{name}/share/extensions/nlpsolver/help
+%{_libdir}/%{name}/share/extensions/nlpsolver/locale
+%{_libdir}/%{name}/share/extensions/nlpsolver/registration
+%{_libdir}/%{name}/share/extensions/nlpsolver/EvolutionarySolver.jar
+%{_libdir}/%{name}/share/extensions/nlpsolver/components.rdb
+%{_libdir}/%{name}/share/extensions/nlpsolver/description.xml
+%{_libdir}/%{name}/share/extensions/nlpsolver/nlpsolver.jar
+
 %if %{with mozilla}
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
@@ -3863,6 +3892,9 @@ fi
 %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)
 
@@ -3881,6 +3913,9 @@ fi
 %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)
 
@@ -4080,8 +4115,8 @@ fi
 %files i18n-pt_BR -f pt_BR.lang
 %defattr(644,root,root,755)
 
-%files i18n-qtz -f qtz.lang
-%defattr(644,root,root,755)
+#%files i18n-qtz -f qtz.lang
+#%defattr(644,root,root,755)
 
 %files i18n-ro -f ro.lang
 %defattr(644,root,root,755)
@@ -4107,6 +4142,9 @@ fi
 %files i18n-si -f si.lang
 %defattr(644,root,root,755)
 
+%files i18n-sid -f sid.lang
+%defattr(644,root,root,755)
+
 %files i18n-sk -f sk.lang
 %defattr(644,root,root,755)
 
@@ -4186,3 +4224,8 @@ fi
 %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