]> git.pld-linux.org Git - packages/libreoffice.git/blobdiff - libreoffice.spec
- rel 3
[packages/libreoffice.git] / libreoffice.spec
index e6127377153622543dfbe437f8b4905f1115187e..c98857c61db16933f4b9d31d8eb3941a444d4d02 100644 (file)
@@ -1,20 +1,36 @@
 # NOTE:
-#      - normal build (athlon) requires about 15 GB of disk space:
-#              $BUILD_ROOT     3.7 GB
-#              BUILD           9.6 GB
+#      - normal build (athlon) requires about 25 GB of disk space:
+#              $BUILD_ROOT     7.0 GB
+#              BUILD          16.2 GB
+#              RPMS            1.2 GB
 #              SRPMS           0.3 GB
-#              RPMS            0.9 GB
+#
+#
 # TODO:
+#   - ON PPC help FILES ARE NOT BUILD DUE TO SOME REASON (is missing java the reason?)
+#   -
+#   /usr/share/openoffice.org/share/registry/modules/org/openoffice/Office/Common/Common-ctl_dz.xcu
+#   /usr/share/openoffice.org/share/registry/modules/org/openoffice/Setup/Langpack-dz.xcu
+#   - --with mono wants static mono
 #      - without system_db will not work (w/ java) as it will use db4.2 which is too old (see r1.650)
 #      - problems with gcc-4.2.0: oowriter is useless (invisble text till refresh)
 #      - fix help files (broken links)
 #      - LFS support is disabled (no_lfs_hack.patch for xml2cmp crash) because it need LFS-ready STLport
-#   - bcond with_mono is broken (cli_types.dll not found, and can't be made)
 #      - maybe it could be build with gcc-java
 #   - adapt help-support.diff to PLD
 #      - configure --without-ppds --without afms
 #      - /share/config/soffice.cfg/global/accelerator/es/ should be in i18n-es
 #      - fix locale names and other locale related things
+#   - broken directory dependencies:
+#       error: openoffice.org-i18n-de-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swform/accelerator/de not found
+#       error: openoffice.org-i18n-de-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swreport/accelerator/de not found
+#       error: openoffice.org-i18n-de-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swxform/accelerator/de not found
+#       error: openoffice.org-i18n-es-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swform/accelerator/es not found
+#       error: openoffice.org-i18n-es-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swreport/accelerator/es not found
+#       error: openoffice.org-i18n-es-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swxform/accelerator/es not found
+#       error: openoffice.org-i18n-fr-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swform/accelerator/fr not found
+#       error: openoffice.org-i18n-fr-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swreport/accelerator/fr not found
+#       error: openoffice.org-i18n-fr-2.4.1.7-ooh680_m17.1: req /usr/share/openoffice.org/share/config/soffice.cfg/modules/swxform/accelerator/fr not found
 #   - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
 #   - more system libs todo:
 #      - (SYSTEM_HYPH) bcond system_libhnj doesn't work - needs Debian-patched version of libhnj
@@ -29,6 +45,7 @@
 #      - in gtk version menu highlight has almost the same colour as menu text
 #      - 6 user/config/*.so? files shared between -i18n-en and -i18n-sl
 #      - add ooglobal symlink and it's ooo-wrapper entry (among calc|draw|impress|math|web|writer)
+#
 
 # Conditional build:
 %bcond_without gnomevfs        # GNOME VFS and Evolution 2 support
 %bcond_with    mono            # enable compilation of mono bindings
 %bcond_without mozilla         # without mozilla components
 %bcond_without i18n            # do not create i18n packages
+%bcond_with    ccache          # use ccache to speed up builds
+%bcond_with    icecream        # use icecream to speed up builds
+%bcond_with    msaccess        # with ms access import pieces
 
 %bcond_without system_beanshell
 %bcond_without system_db               # without system (i.e. with internal) Berkeley DB
 %bcond_with    system_libhnj           # with system ALTLinuxhyph (NFY)
-%bcond_without system_mdbtools
+%bcond_without system_mdbtools         # with system mdbtools
 %bcond_without system_xalan
 %bcond_without system_xerces
 %bcond_without system_xml_apis
 %bcond_without system_hsqldb
-%bcond_without system_agg
+%bcond_with    system_agg              # with system agg
 %bcond_without system_hunspell
 %bcond_without system_myspell
 %bcond_with    system_xt
 %undefine      with_system_hsqldb
 %endif
 
-%define                ver             2.1.0
-%define                _rel            7
-%define                subver          680
-%define                snap            OOE680
-%define                snap2           SRC680
-%define                bver            m6
-%define                bbver           m6
-%define                bugfix          %{nil}
-%define                ooobver         ooe680-%{bbver}
-%define                ssnap           ooe680-%{bver}
-
-%define                specflags       -fno-strict-aliasing
+%define                upd                     680
+%define                mws                     OOH%{upd}
+%define                tag                     %(echo %{mws} | tr A-Z a-z)-%{milestone}
+%define                milestone       m17
+%define                _tag            %(echo %{tag} | tr - _)
+%define                _rel            3
 
 Summary:       OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):     OpenOffice.org - potężny pakiet biurowy
 Name:          openoffice.org
-Version:       %{ver}%{bugfix}
-Release:       0.%{bver}%{?without_gnomevfs:.novfs}.%{_rel}
+Version:       2.4.1.7
+Release:       %{_tag}.%{_rel}
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-#Source0:      http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-Source0:       ooo-build-%{ooobver}.tar.gz
-# Source0-md5: 797f04099223b549ed1b4939dfc2a335
-Source1:       http://go-ooo.org/packages/%{snap}/%{ssnap}-core.tar.bz2
-# Source1-md5: 7dbf5f7ea4f469bb6c8b1d6037567431
-Source2:       http://go-ooo.org/packages/%{snap}/%{ssnap}-system.tar.bz2
-# Source2-md5: 7f645231043a776c07a22300c0a10848
-Source3:       http://go-ooo.org/packages/%{snap}/%{ssnap}-binfilter.tar.bz2
-# Source3-md5: 22acf75656a2186d8a969ee5069ef193
-Source4:       http://go-ooo.org/packages/%{snap}/%{ssnap}-lang.tar.bz2
-# Source4-md5: 9b1a1d5dafbde7cbc90da8b903e6b0bf
-Source10:      http://go-ooo.org/packages/%{snap2}/ooo_custom_images-13.tar.bz2
+# we use svn because released tarballs are buggy too often
+# svn export http://svn.gnome.org/svn/ooo-build/branches/ooo-build-2-4-1 ooo-build
+Source0:       ooo-build-r13288.tar.bz2
+# Source0-md5: 589cffb42411f2d94186491b09115447
+Source1:       http://download.go-oo.org/%{mws}/%{tag}-core.tar.bz2
+# Source1-md5: ddaaf10f08d1fbeec42383e13f587a31
+Source2:       http://download.go-oo.org/%{mws}/%{tag}-system.tar.bz2
+# Source2-md5: 8638695691707cac9272a97a991a240f
+Source3:       http://download.go-oo.org/%{mws}/%{tag}-binfilter.tar.bz2
+# Source3-md5: d3bad14d049cf2ae96ba8dc5d3cd9145
+Source4:       http://download.go-oo.org/%{mws}/%{tag}-lang.tar.bz2
+# Source4-md5: 92a46a30ee752f6ef9b4718895a4dd0c
+Source10:      http://download.go-oo.org/SRC680/ooo_custom_images-13.tar.bz2
 # Source10-md5:        2480af7f890c8175c7f9e183a1b39ed2
-Source11:      http://go-ooo.org/packages/%{snap2}/ooo_crystal_images-6.tar.bz2
+Source11:      http://download.go-oo.org/SRC680/ooo_crystal_images-6.tar.bz2
 # Source11-md5:        586d0f26b3f79d89bbb5b25b874e3df6
-Source12:      http://go-ooo.org/packages/%{snap2}/extras-2.tar.bz2
+Source12:      http://download.go-oo.org/SRC680/extras-2.tar.bz2
 # Source12-md5:        733051ebeffae5232a2eb760162da020
-Source15:      http://go-ooo.org/packages/xt/xt-20051206-src-only.zip
+Source15:      http://download.go-oo.org/xt/xt-20051206-src-only.zip
 # Source15-md5:        0395e6e7da27c1cea7e1852286f6ccf9
-Source16:      http://go-ooo.org/packages/%{snap2}/lp_solve_5.5.tar.gz
-# Source16-md5:        2ff7b4c52f9c3937ebe3002798fbc479
-Source17:      http://go-ooo.org/packages/%{snap2}/biblio.tar.bz2
+Source16:      http://download.go-oo.org/SRC680/lp_solve_5.5.0.10_source.tar.gz
+# Source16-md5:        26b3e95ddf3d9c077c480ea45874b3b8
+Source17:      http://download.go-oo.org/SRC680/biblio.tar.bz2
 # Source17-md5:        1948e39a68f12bfa0b7eb309c14d940c
-Source50:      openabout_pld.png
-Source51:      openintro_pld.bmp
+Source18:      http://download.go-oo.org/%{mws}/cli_types.dll
+# Source18-md5:        3ae35431f8c7356e4ae806195dbc35f9
+Source19:      http://download.go-oo.org/%{mws}/cli_types_bridgetest.dll
+# Source19-md5:        d09792656eb45850b8b84424a23a6ce2
+Source22:      http://download.go-oo.org/SRC680/oox.2008-02-29.tar.bz2
+# Source22-md5:        09829c269788249aeb617a683f8cfa94
+Source23:      http://download.go-oo.org/SRC680/writerfilter.2008-02-29.tar.bz2
+# Source23-md5:        7666cc504d16b8b6598450001cfca403
 # patches applied in prep section
 Patch0:                %{name}-PLD.patch
-Patch1:                %{name}-vendorname.patch
-Patch2:                %{name}-stl5_fix.patch
-Patch3:                %{name}-mdbtools_fix.diff
-Patch4:                %{name}-nolfs_hack.patch
-Patch5:                %{name}-no_fonts_dir_buildfix.patch
-Patch6:                %{name}-java16.patch
-Patch7:                %{name}-nodictinst.patch
+Patch1:                %{name}-gcc-Wextra.patch
+# patch50/51 need review
+Patch50:       %{name}-mdbtools_fix.diff
+Patch51:       %{name}-nodictinst.patch
 # patches applied by ooo-patching-system
-Patch100:      %{name}-STL-lib64.diff
-Patch101:      %{name}-64bit-inline.diff
-Patch102:      %{name}-build-pld-splash.diff
-Patch104:      %{name}-portaudio_v19.diff
-Patch106:      %{name}-seamonkey.diff
-Patch107:      %{name}-stl-amd64.patch
-Patch108:      %{name}-java6.patch
-Patch109:      %{name}-agg25.patch
+Patch100:      %{name}-lang.patch
+#Patch101:     %{name}-java6.patch
+Patch103:      %{name}-missing-includes.diff
+Patch104:      %{name}-xulrunner.patch
+# patches 1000+ need review
+Patch1001:     %{name}-64bit-inline.diff
+Patch1002:     %{name}-build-pld-splash.diff
+Patch1003:     %{name}-portaudio_v19.diff
+Patch1004:     %{name}-agg25.patch
+Patch1005:     %{name}-nsplugin-path.diff
+Patch1006:     %{name}-perl-nodiag.patch
+Patch1007:     %{name}-gcc42-swregion.diff
 URL:           http://www.openoffice.org/
 BuildRequires: /usr/bin/getopt
-BuildRequires: STLport-devel >= 2:5.0.0
+BuildRequires: GConf2-devel
+BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
 %{?with_system_agg:BuildRequires:      agg-devel}
+BuildRequires: atk-devel >= 1:1.9.0
 BuildRequires: autoconf >= 2.51
 BuildRequires: automake >= 1:1.9
 %{?with_system_beanshell:BuildRequires:        beanshell}
 BuildRequires: bison >= 1.875-4
-BuildRequires: boost-devel
-BuildRequires: boost-mem_fn-devel
-BuildRequires: boost-spirit-devel
-BuildRequires: cairo-devel >= 0.5.2
+BuildRequires: boost-devel >= 1.35.0
+BuildRequires: cairo-devel >= 1.2.0
+%{?with_ccache:BuildRequires:  ccache}
 BuildRequires: cups-devel
 BuildRequires: curl-devel >= 7.9.8
 %{?with_system_db:BuildRequires:       db-cxx-devel}
 %{?with_system_db:BuildRequires:       db-devel}
+BuildRequires: dbus-glib-devel
+# rpm has problems with determining this on builders
+# BuildRequires:       diskspace(%{_builddir}) >= 16Gb
 BuildRequires: flex
 BuildRequires: fontconfig-devel >= 1.0.1
 BuildRequires: freetype-devel >= 2.1
+BuildRequires: glib2-devel >= 2.13.5
 %{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel}
+BuildRequires: gperf
 BuildRequires: gstreamer-devel >= 0.10.0
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires: gtk+2-devel
-%{?with_system_hsqldb:BuildRequires:   hsqldb >= 1.8.0}
-%{?with_system_hunspell:BuildRequires: hunspell-devel}
+BuildRequires: gtk+2-devel >= 2:2.10
+%{?with_system_hsqldb:BuildRequires:   hsqldb >= 1.8.0.9}
+%{?with_system_hunspell:BuildRequires: hunspell-devel >=1.2.2}
+%{?with_icecream:BuildRequires:        icecream}
 BuildRequires: icu
 %{?with_kde:BuildRequires:     kdelibs-devel}
 BuildRequires: libart_lgpl-devel
 BuildRequires: libbonobo-devel >= 2.0
-%{?with_csystem_libhnj:BuildRequires:  libhnj-devel}
+%{?with_system_libhnj:BuildRequires:   libhnj-devel}
 BuildRequires: libicu-devel >= 3.4
 BuildRequires: libjpeg-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libstdc++-devel >= 5:3.2.1
+BuildRequires: libsvg-devel >= 0.1.4
 BuildRequires: libwpd-devel >= 0.8.6
+BuildRequires: libwpg-devel >= 0.1.0
+BuildRequires: libwps-devel
 BuildRequires: libxml2-devel >= 2.0
-%{?with_system_mdbtools:BuildRequires: mdbtools-devel >= 0.6}
-%{?with_mono:BuildRequires:    mono-csharp >= 1.1.8}
-%{?with_mono:BuildRequires:    mono-devel >= 1.1.8}
+%{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
+%{?with_mono:BuildRequires:    mono-csharp >= 1.2.3}
+%{?with_mono:BuildRequires:    mono-static >= 1.2.3}
 %{?with_system_myspell:BuildRequires:  myspell-devel}
 BuildRequires: nas-devel >= 1.7-1
 BuildRequires: neon-devel
@@ -175,6 +208,7 @@ BuildRequires:      nspr-devel >= 1:4.6-0.20041030.3
 BuildRequires: nss-devel >= 1:3.10
 BuildRequires: openldap-devel
 BuildRequires: pam-devel
+BuildRequires: pango-devel >= 1:1.17.3
 BuildRequires: perl-Archive-Zip
 BuildRequires: perl-base
 BuildRequires: pkgconfig
@@ -189,14 +223,16 @@ BuildRequires:    sane-backends-devel
 BuildRequires: sed >= 4.0
 BuildRequires: startup-notification-devel >= 0.5
 BuildRequires: tcsh
-BuildRequires: unixODBC-devel
+BuildRequires: unixODBC-devel >= 2.2.12-2
 BuildRequires: unzip
 %{?with_system_xalan:BuildRequires:    xalan-j}
 %{?with_system_xerces:BuildRequires:   xerces-j}
 %{?with_system_xml_apis:BuildRequires: xml-commons}
+BuildRequires: xmlsec1-devel
 BuildRequires: xmlsec1-nss-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXtst-devel
 %{?with_system_xt:BuildRequires:       xt}
 BuildRequires: zip
 BuildRequires: zlib-devel
@@ -205,11 +241,10 @@ BuildRequires:    ant
 %{?with_system_db:BuildRequires:       db-java >= 4.3}
 BuildRequires: jar
 BuildRequires: jdk >= 1.4.0_00
-%else
-BuildRequires: libxslt-progs
+BuildRequires: jre-X11
 %endif
+BuildRequires: libxslt-progs
 BuildRequires: xulrunner-devel
-BuildConflicts:        STLport4
 Requires:      %{name}-base = %{epoch}:%{version}-%{release}
 Requires:      %{name}-calc = %{epoch}:%{version}-%{release}
 Requires:      %{name}-draw = %{epoch}:%{version}-%{release}
@@ -227,9 +262,14 @@ Requires:  fonts-TTF-OpenSymbol = %{epoch}:%{version}-%{release}
 ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# No ELF objects there to strip/chrpath (skips processing 17k files totaling 415M)
-%define                _noautostrip    .*%{_datadir}/%{name}/.*
-%define                _noautochrpath  .*%{_datadir}/%{name}/.*
+%define                specflags       -fno-strict-aliasing -O2
+
+# No ELF objects there to strip/chrpath, skips processing:
+# - share/ - 17000 files of 415M
+# - help/ - 6500 files of 1.4G
+# - program/resource/ - 5610 files of 216M
+%define                _noautostrip    .*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
+%define                _noautochrpath  .*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
 
 %description
 OpenOffice.org is an open-source project sponsored by Sun Microsystems
@@ -307,12 +347,12 @@ Requires: sed
 %{?with_system_xerces:Requires:        xerces-j}
 %{?with_system_xml_apis:Requires:      xml-commons}
 %{?with_system_xt:Requires:    xt}
+#Suggests:     chkfontpath
 Obsoletes:     oooqs
 Obsoletes:     openoffice
 Obsoletes:     openoffice-libs
 Obsoletes:     openoffice.org-dirs
 Obsoletes:     openoffice.org-libs < 1:2.1.0-0.m6.0.11
-#Suggests:     chkfontpath
 
 %description core
 Core libraries and support files for OpenOffice.org.
@@ -535,8 +575,8 @@ Ta wtyczka umożliwia wyświetlanie dokumentów OOo wewnątrz stron.
 %package i18n-af
 Summary:       OpenOffice.org - interface in Afrikaans language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku afrykanerskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-af
 Obsoletes:     openoffice-i18n-af-gtk
 Obsoletes:     openoffice.org-i18n-af-gtk
@@ -553,8 +593,8 @@ afrykanerskim.
 %package i18n-ar
 Summary:       OpenOffice.org - interface in Arabic language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku arabskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ar
 Obsoletes:     openoffice-i18n-ar-gtk
 Obsoletes:     openoffice.org-i18n-ar-gtk
@@ -571,8 +611,8 @@ arabskim.
 %package i18n-as_IN
 Summary:       OpenOffice.org - interface in Assamese language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku asamskim dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-as_IN
 This package provides resources containing menus and dialogs in
@@ -585,8 +625,8 @@ asamskim dla Indii.
 %package i18n-be_BY
 Summary:       OpenOffice.org - interface in Belarusian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku białoruskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-be_BY
 This package provides resources containing menus and dialogs in
@@ -599,8 +639,8 @@ białoruskim.
 %package i18n-bg
 Summary:       OpenOffice.org - interface in Bulgarian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bułgarskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-bg
 Obsoletes:     openoffice-i18n-bg-gtk
 Obsoletes:     openoffice.org-i18n-bg-gtk
@@ -617,8 +657,8 @@ bułgarskim.
 %package i18n-bn
 Summary:       OpenOffice.org - interface in Bangla language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bengalskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-bn
 This package provides resources containing menus and dialogs in Bangla
@@ -631,8 +671,8 @@ bengalskim.
 %package i18n-bn_BD
 Summary:       OpenOffice.org - interface in Bangla language for Bangladesh
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bengalskim dla Bangladeszu
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-bn_BD
 This package provides resources containing menus and dialogs in Bangla
@@ -645,8 +685,8 @@ bengalskim dla Bangladeszu.
 %package i18n-bn_IN
 Summary:       OpenOffice.org - interface in Bangla language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bengalskim dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-bn_IN
 This package provides resources containing menus and dialogs in Bangla
@@ -659,8 +699,8 @@ bengalskim dla Indii.
 %package i18n-br
 Summary:       OpenOffice.org - interface in Breton language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bretońskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-br
 This package provides resources containing menus and dialogs in Breton
@@ -672,9 +712,9 @@ bretońskim.
 
 %package i18n-bs
 Summary:       OpenOffice.org - interface in Bosnian language
-Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bośniańskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku bośniackim
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-bs
 This package provides resources containing menus and dialogs in
@@ -682,13 +722,13 @@ Bosnian language.
 
 %description i18n-bs -l pl.UTF-8
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
-bośniańskim
+bośniackim
 
 %package i18n-ca
 Summary:       OpenOffice.org - interface in Catalan language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku katalońskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ca
 Obsoletes:     openoffice-i18n-ca-gtk
 Obsoletes:     openoffice.org-i18n-ca-gtk
@@ -702,12 +742,11 @@ Catalan language.
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 katalońskim.
 
-
 %package i18n-cs
 Summary:       OpenOffice.org - interface in Czech language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku czeskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-cs
 Obsoletes:     openoffice-i18n-cs-gtk
 Obsoletes:     openoffice.org-i18n-cs-gtk
@@ -724,8 +763,8 @@ czeskim.
 %package i18n-cy
 Summary:       OpenOffice.org - interface in Cymraeg language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku walijskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-cy
 Obsoletes:     openoffice-i18n-cy-gtk
 Obsoletes:     openoffice.org-i18n-cy-gtk
@@ -742,8 +781,8 @@ walijskim.
 %package i18n-da
 Summary:       OpenOffice.org - interface in Danish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku duńskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-da
 Obsoletes:     openoffice-i18n-da-gtk
 Obsoletes:     openoffice.org-i18n-da-gtk
@@ -760,8 +799,8 @@ duńskim.
 %package i18n-de
 Summary:       OpenOffice.org - interface in German language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku niemieckim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-de
 Obsoletes:     openoffice-i18n-de-gtk
 Obsoletes:     openoffice.org-i18n-de-gtk
@@ -775,11 +814,25 @@ language.
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 niemieckim.
 
+%package i18n-dz
+Summary:       OpenOffice.org - interface in Dzongkha language
+Summary(pl.UTF-8):     Openoffice.org - interfejs w języku dżongkha
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-dz
+This package provides resources containing menus and dialogs in
+Dzongkha language.
+
+%description i18n-dz -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+dżongkha.
+
 %package i18n-el
 Summary:       OpenOffice.org - interface in Greek language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku greckim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-el
 Obsoletes:     openoffice-i18n-el-gtk
 Obsoletes:     openoffice.org-i18n-el-gtk
@@ -796,8 +849,8 @@ greckim.
 %package i18n-en_GB
 Summary:       OpenOffice.org - interface in English language for United Kingdom
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku anglieskim dla Wielkiej Brytanii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-en_GB
 This package provides resources containing menus and dialogs in
@@ -810,8 +863,8 @@ anglieskim dla Wielkiej Brytanii.
 %package i18n-en_ZA
 Summary:       OpenOffice.org - interface in English language for South Africa
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku anglieskim dla Południowej Afryki
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-en_ZA
 This package provides resources containing menus and dialogs in
@@ -824,8 +877,8 @@ anglieskim dla Południowej Afryki.
 %package i18n-eo
 Summary:       OpenOffice.org - interface in Esperanto language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku esperanto
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-eo
 This package provides resources containing menus and dialogs in
@@ -838,8 +891,8 @@ esperanto.
 %package i18n-es
 Summary:       OpenOffice.org - interface in Spanish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku hiszpańskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-es
 Obsoletes:     openoffice-i18n-es-gtk
 Obsoletes:     openoffice.org-i18n-es-gtk
@@ -856,8 +909,8 @@ hiszpańskim.
 %package i18n-et
 Summary:       OpenOffice.org - interface in Estonian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku estońskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-et
 Obsoletes:     openoffice-i18n-et-gtk
 Obsoletes:     openoffice.org-i18n-et-gtk
@@ -874,8 +927,8 @@ estońskim.
 %package i18n-eu
 Summary:       OpenOffice.org - interface in Basque (Euskara) language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku baskijskim (euskera)
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-eu
 Obsoletes:     openoffice-i18n-eu-gtk
 Obsoletes:     openoffice-i18n-eu-kde
@@ -891,8 +944,8 @@ baskijskim (euskera).
 %package i18n-fa
 Summary:       OpenOffice.org - interface in Persian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku perskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-fa
 Obsoletes:     openoffice-i18n-fa-gtk
 Obsoletes:     openoffice-i18n-fa-kde
@@ -908,8 +961,8 @@ perskim.
 %package i18n-fi
 Summary:       OpenOffice.org - interface in Finnish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku fińskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-fi
 Obsoletes:     openoffice-i18n-fi-gtk
 Obsoletes:     openoffice.org-i18n-fi-gtk
@@ -926,8 +979,8 @@ fińskim.
 %package i18n-fo
 Summary:       OpenOffice.org - interface in Faroese language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku farerskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-fo
 Obsoletes:     openoffice-i18n-fo-gtk
 Obsoletes:     openoffice.org-i18n-fo-gtk
@@ -944,8 +997,8 @@ farerskim.
 %package i18n-fr
 Summary:       OpenOffice.org - interface in French language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku francuskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-fr
 Obsoletes:     openoffice-i18n-fr-gtk
 Obsoletes:     openoffice.org-i18n-fr-gtk
@@ -962,8 +1015,8 @@ francuskim.
 %package i18n-ga
 Summary:       OpenOffice.org - interface in Irish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku irlandzkim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ga
 Obsoletes:     openoffice-i18n-ga-gtk
 Obsoletes:     openoffice.org-i18n-ga-gtk
@@ -980,8 +1033,8 @@ irlandzkim.
 %package i18n-gl
 Summary:       OpenOffice.org - interface in Galician language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku galicyjskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-gl
 Obsoletes:     openoffice-i18n-gl-gtk
 Obsoletes:     openoffice.org-i18n-gl-gtk
@@ -998,8 +1051,8 @@ galicyjskim.
 %package i18n-gu_IN
 Summary:       OpenOffice.org - interface in Gujarati language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku gudźarati
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-gu_IN
 This package provides resources containing menus and dialogs in
@@ -1012,8 +1065,8 @@ gudźarati.
 %package i18n-he
 Summary:       OpenOffice.org - interface in Hebrew language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku hebrajskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-he
 Obsoletes:     openoffice-i18n-he-gtk
 Obsoletes:     openoffice.org-i18n-he-gtk
@@ -1030,8 +1083,8 @@ hebrajskim.
 %package i18n-hi_IN
 Summary:       OpenOffice.org - interface in Hindi language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku hindi
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-hi
 Obsoletes:     openoffice-i18n-hi-gtk
 Obsoletes:     openoffice.org-i18n-hi-gtk
@@ -1048,8 +1101,8 @@ hindi.
 %package i18n-hr
 Summary:       OpenOffice.org - interface in Croatian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku chorwackim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-hr
 Obsoletes:     openoffice-i18n-hr-gtk
 Obsoletes:     openoffice.org-i18n-hr-gtk
@@ -1066,8 +1119,8 @@ chorwackim.
 %package i18n-hu
 Summary:       OpenOffice.org - interface in Hungarian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku węgierskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-hu
 Obsoletes:     openoffice-i18n-hu-gtk
 Obsoletes:     openoffice.org-i18n-hu-gtk
@@ -1084,8 +1137,8 @@ węgierskim.
 %package i18n-ia
 Summary:       OpenOffice.org - interface in Interlingua language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku interlingua
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ia
 Obsoletes:     openoffice-i18n-ia-gtk
 Obsoletes:     openoffice.org-i18n-ia-gtk
@@ -1102,8 +1155,8 @@ interlingua.
 %package i18n-id
 Summary:       OpenOffice.org - interface in Indonesian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku indonezyjskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-id
 Obsoletes:     openoffice-i18n-id-gtk
 Obsoletes:     openoffice.org-i18n-id-gtk
@@ -1120,8 +1173,8 @@ indonezyjskim.
 %package i18n-it
 Summary:       OpenOffice.org - interface in Italian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku włoskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-it
 ObsoleteS:     openoffice-i18n-it-gtk
 Obsoletes:     openoffice.org-i18n-it-gtk
@@ -1138,8 +1191,8 @@ włoskim.
 %package i18n-ja
 Summary:       OpenOffice.org - interface in Japan language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku japońskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ja
 Obsoletes:     openoffice-i18n-ja-gtk
 Obsoletes:     openoffice.org-i18n-ja-gtk
@@ -1153,11 +1206,25 @@ language.
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 japońskim.
 
+%package i18n-ka
+Summary:       OpenOffice.org - interface in Georgian language
+Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku gruzińskim
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-ka
+This package provides resources containing menus and dialogs in
+Georgian language.
+
+%description i18n-ka -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+gruzińskim.
+
 %package i18n-km
 Summary:       OpenOffice.org - interface in Khmer language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku khmerskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-km
 This package provides resources containing menus and dialogs in Khmer
@@ -1170,8 +1237,8 @@ khmerskim.
 %package i18n-kn_IN
 Summary:       OpenOffice.org - interface in Kannada language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku kannara
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-kn
 Obsoletes:     openoffice-i18n-kn-gtk
 Obsoletes:     openoffice-i18n-kn-kde
@@ -1187,8 +1254,8 @@ kannara.
 %package i18n-ko
 Summary:       OpenOffice.org - interface in Korean language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku koreańskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ko
 Obsoletes:     openoffice-i18n-ko-gtk
 Obsoletes:     openoffice.org-i18n-ko-gtk
@@ -1205,8 +1272,8 @@ koreańskim.
 %package i18n-ku
 Summary:       OpenOffice.org - interface in Kurdish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku kurdyjskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ku
 This package provides resources containing menus and dialogs in
@@ -1219,8 +1286,8 @@ kurdyjskim.
 %package i18n-la
 Summary:       OpenOffice.org - interface in Latin language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku łacińskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-la
 Obsoletes:     openoffice-i18n-la-gtk
 Obsoletes:     openoffice.org-i18n-la-gtk
@@ -1237,8 +1304,8 @@ Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 %package i18n-lo
 Summary:       OpenOffice.org - interface in Lao language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku laotańskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-lo
 This package provides resources containing menus and dialogs in Lao
@@ -1251,8 +1318,8 @@ laotańskim.
 %package i18n-lt
 Summary:       OpenOffice.org - interface in Lithuanian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku litewskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-lt
 Obsoletes:     openoffice-i18n-lt-gtk
 Obsoletes:     openoffice.org-i18n-lt-gtk
@@ -1269,8 +1336,8 @@ litewskim.
 %package i18n-lv
 Summary:       OpenOffice.org - interface in Latvian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku łotewskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-lv
 This package provides resources containing menus and dialogs in
@@ -1283,8 +1350,8 @@ Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 %package i18n-med
 Summary:       OpenOffice.org - interface in Melpa language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku melpa
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-med
 Obsoletes:     openoffice-i18n-med-gtk
 Obsoletes:     openoffice.org-i18n-med-gtk
@@ -1301,8 +1368,8 @@ melpa.
 %package i18n-mi
 Summary:       OpenOffice.org - interface in Maori language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku maoryjskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-mi
 Obsoletes:     openoffice-i18n-mi-gtk
 Obsoletes:     openoffice.org-i18n-mi-gtk
@@ -1319,8 +1386,8 @@ maoryjskim.
 %package i18n-mk
 Summary:       OpenOffice.org - interface in Macedonian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku macedońskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-mk
 This package provides resources containing menus and dialogs in
@@ -1333,8 +1400,8 @@ macedońskim.
 %package i18n-ml_IN
 Summary:       OpenOffice.org - interface in Malayalam language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku malajalamskim dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ml_IN
 This package provides resources containing menus and dialogs in
@@ -1347,8 +1414,8 @@ malajalamskim dla Indii.
 %package i18n-mr_IN
 Summary:       OpenOffice.org - interface in Marathi language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku marathi dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-mr_IN
 This package provides resources containing menus and dialogs in
@@ -1361,8 +1428,8 @@ marathi dla Indii.
 %package i18n-ms
 Summary:       OpenOffice.org - interface in Malay language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku malajskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ms
 Obsoletes:     openoffice-i18n-ms-gtk
 Obsoletes:     openoffice.org-i18n-ms-gtk
@@ -1379,8 +1446,8 @@ malajskim.
 %package i18n-nb
 Summary:       OpenOffice.org - interface in Norwegian Bokmaal language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku norweskim (odmiana Bokmaal)
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-nb
 Obsoletes:     openoffice-i18n-nb-gtk
 Obsoletes:     openoffice.org-i18n-nb-gtk
@@ -1397,8 +1464,8 @@ norweskim w odmianie Bokmaal.
 %package i18n-ne
 Summary:       OpenOffice.org - interface in Nepali language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku nepalskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ne
 This package provides resources containing menus and dialogs in Nepali
@@ -1411,8 +1478,8 @@ nepalskim.
 %package i18n-nl
 Summary:       OpenOffice.org - interface in Dutch language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku holenderskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-nl
 Obsoletes:     openoffice-i18n-nl-gtk
 Obsoletes:     openoffice.org-i18n-nl-gtk
@@ -1429,8 +1496,8 @@ holenderskim.
 %package i18n-nn
 Summary:       OpenOffice.org - interface in Norwegian Nynorsk language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku norweskim (odmiana Nynorsk)
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-nn
 Obsoletes:     openoffice-i18n-nn-gtk
 Obsoletes:     openoffice.org-i18n-nn-gtk
@@ -1447,8 +1514,8 @@ norweskim w odmianie Nynorsk.
 %package i18n-nr
 Summary:       OpenOffice.org - interface in South Ndebele language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku ndebele (południowym)
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-nr
 This package provides resources containing menus and dialogs in South
@@ -1461,8 +1528,8 @@ ndebele (południowym).
 %package i18n-nso
 Summary:       OpenOffice.org - interface in Northern Sotho language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku ludu Soto
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-nso
 Obsoletes:     openoffice-i18n-nso-gtk
 Obsoletes:     openoffice.org-i18n-nso-gtk
@@ -1479,8 +1546,8 @@ ludu Soto.
 %package i18n-or_IN
 Summary:       OpenOffice.org - interface in Oriya language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku orija dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-or_IN
 This package provides resources containing menus and dialogs in Oriya
@@ -1493,8 +1560,8 @@ orija dla Indii.
 %package i18n-pa_IN
 Summary:       OpenOffice.org - interface in Punjabi language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku pendżabskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-pa_IN
 This package provides resources containing menus and dialogs in
@@ -1507,8 +1574,8 @@ pendżabskim.
 %package i18n-pl
 Summary:       OpenOffice.org - interface in Polish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku polskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-pl
 Obsoletes:     openoffice-i18n-pl-gtk
 Obsoletes:     openoffice.org-i18n-pl-gtk
@@ -1525,8 +1592,8 @@ polskim.
 %package i18n-pt
 Summary:       OpenOffice.org - interface in Portuguese language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku portugalskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-pt
 Obsoletes:     openoffice-i18n-pt-gtk
 Obsoletes:     openoffice.org-i18n-pt-gtk
@@ -1543,8 +1610,8 @@ portugalskim.
 %package i18n-pt_BR
 Summary:       OpenOffice.org - interface in Brazilian Portuguese language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku portugalskim dla Brazylii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-pt_BR
 Obsoletes:     openoffice-i18n-pt_BR-gtk
 Obsoletes:     openoffice.org-i18n-pt_BR-gtk
@@ -1561,8 +1628,8 @@ portugalskim dla Brazylii.
 %package i18n-ro
 Summary:       OpenOffice.org - interface in Romanian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku rumuńskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ro
 Obsoletes:     openoffice-i18n-ro-gtk
 Obsoletes:     openoffice.org-i18n-ro-gtk
@@ -1579,8 +1646,8 @@ rumuńskim.
 %package i18n-ru
 Summary:       OpenOffice.org - interface in Russian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku rosyjskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-ru
 Obsoletes:     openoffice-i18n-ru-gtk
 Obsoletes:     openoffice.org-i18n-ru-gtk
@@ -1597,8 +1664,8 @@ rosyjskim.
 %package i18n-rw
 Summary:       OpenOffice.org - interface in Kinarwanda language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku kinya-ruanda
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-rw
 This package provides resources containing menus and dialogs in
@@ -1611,8 +1678,8 @@ kinya-ruanda.
 %package i18n-sh
 Summary:       OpenOffice.org - interface in Serbo-Croatian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku serbsko-chorwackim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-sh
 This package provides resources containing menus and dialogs in
@@ -1625,8 +1692,8 @@ serbsko-chorwackim.
 %package i18n-sk
 Summary:       OpenOffice.org - interface in Slovak language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku słowackim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-sk
 Obsoletes:     openoffice-i18n-sk-gtk
 Obsoletes:     openoffice.org-i18n-sk-gtk
@@ -1643,8 +1710,8 @@ słowackim.
 %package i18n-sl
 Summary:       OpenOffice.org - interface in Slovenian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku słoweńskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-sl
 Obsoletes:     openoffice-i18n-sl-gtk
 Obsoletes:     openoffice.org-i18n-sl-gtk
@@ -1661,8 +1728,8 @@ słoweńskim.
 %package i18n-sr
 Summary:       OpenOffice.org - interface in Serbian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku serbskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-sr
 This package provides resources containing menus and dialogs in
@@ -1673,24 +1740,24 @@ Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 serbskim.
 
 %package i18n-ss
-Summary:       OpenOffice.org - interface in Siswant language
-Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku siswati
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Summary:       OpenOffice.org - interface in Swati language
+Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku suazi (siswati)
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ss
-This package provides resources containing menus and dialogs in
-Siswant language.
+This package provides resources containing menus and dialogs in Swati
+language.
 
 %description i18n-ss -l pl.UTF-8
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
-siswati.
+suazi (siswati).
 
 %package i18n-st
 Summary:       OpenOffice.org - interface in Southern Sotho language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku południowym sotho
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-st
 This package provides resources containing menus and dialogs in
@@ -1703,8 +1770,8 @@ południowym sotho.
 %package i18n-sv
 Summary:       OpenOffice.org - interface in Swedish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku szwedzkim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-sv
 Obsoletes:     openoffice-i18n-sv-gtk
 Obsoletes:     openoffice.org-i18n-sv-gtk
@@ -1721,8 +1788,8 @@ szwedzkim.
 %package i18n-sw
 Summary:       OpenOffice.org - interface in Swahili language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku suahili
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-sw
 This package provides resources containing menus and dialogs in
@@ -1735,8 +1802,8 @@ suahili.
 %package i18n-sw_TZ
 Summary:       OpenOffice.org - interface in Swahili language for Tanzania
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku suahili dla Tanzanii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-sw_TZ
 This package provides resources containing menus and dialogs in
@@ -1749,8 +1816,8 @@ suahili dla Tanzanii.
 %package i18n-sx
 Summary:       OpenOffice.org - interface in Sutu language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku sutu
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-sx
 This package provides resources containing menus and dialogs in Sutu
@@ -1763,8 +1830,8 @@ sutu.
 %package i18n-ta_IN
 Summary:       OpenOffice.org - interface in Tamil language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tamiskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ta_IN
 This package provides resources containing menus and dialogs in Tamil
@@ -1777,8 +1844,8 @@ tamilskim.
 %package i18n-te_IN
 Summary:       OpenOffice.org - interface in Telugu language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku telugu dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-te_IN
 This package provides resources containing menus and dialogs in Telugu
@@ -1791,8 +1858,8 @@ telugu dla Indii.
 %package i18n-tg
 Summary:       OpenOffice.org - interface in Tajik language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tadżyckim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-tg
 This package provides resources containing menus and dialogs in Tajik
@@ -1805,8 +1872,8 @@ tadżyckim.
 %package i18n-th
 Summary:       OpenOffice.org - interface in Thai language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tajskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-th
 Obsoletes:     openoffice-i18n-th-gtk
 Obsoletes:     openoffice-i18n-th-kde
@@ -1822,8 +1889,8 @@ tajskim.
 %package i18n-ti_ER
 Summary:       OpenOffice.org - interface in Tigrigna language for Eritrea
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tigrinia dla Erytrei
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ti_ER
 This package provides resources containing menus and dialogs in
@@ -1836,8 +1903,8 @@ tigrinia dla Erytrei.
 %package i18n-tn
 Summary:       OpenOffice.org - interface in Tswana language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tswana
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-tn
 Obsoletes:     openoffice-i18n-tn-gtk
 Obsoletes:     openoffice-i18n-tn-kde
@@ -1853,8 +1920,8 @@ tswana.
 %package i18n-tr
 Summary:       OpenOffice.org - interface in Turkish language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tureckim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-tr
 Obsoletes:     openoffice-i18n-tr-gtk
 Obsoletes:     openoffice.org-i18n-tr-gtk
@@ -1871,8 +1938,8 @@ tureckim.
 %package i18n-ts
 Summary:       OpenOffice.org - interface in Tsonga language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku tsonga
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ts
 This package provides resources containing menus and dialogs in Tsonga
@@ -1885,8 +1952,8 @@ tsonga.
 %package i18n-uk
 Summary:       OpenOffice.org - interface in Ukrainian language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku ukraińskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-uk
 Obsoletes:     openoffice-i18n-uk-gtk
 Obsoletes:     openoffice.org-i18n-uk-gtk
@@ -1903,8 +1970,8 @@ ukraińskim.
 %package i18n-ur_IN
 Summary:       OpenOffice.org - interface in Urdu language for India
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku urdu dla Indii
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ur_IN
 This package provides resources containing menus and dialogs in Urdu
@@ -1914,11 +1981,24 @@ language for India.
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 urdu dla Indii.
 
+%package i18n-uz
+Summary:       OpenOffice.org - interface in Uzbek language
+Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku uzbeckim
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-uz
+This package provides resources containing menus and dialogs in Uzbek.
+
+%description i18n-uz -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+uzbeckim.
+
 %package i18n-ve
 Summary:       OpenOffice.org - interface in Venda language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku venda
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ve
 This package provides resources containing menus and dialogs in Venda
@@ -1931,8 +2011,8 @@ venda.
 %package i18n-vi
 Summary:       OpenOffice.org - interface in Vietnamese language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku wietnamskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-vi
 This package provides resources containing menus and dialogs in
@@ -1945,8 +2025,8 @@ wietnamskim.
 %package i18n-xh
 Summary:       OpenOffice.org - interface in Xhosa language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku khosa
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-xh
 This package provides resources containing menus and dialogs in Xhosa
@@ -1959,8 +2039,8 @@ khosa.
 %package i18n-zh_CN
 Summary:       OpenOffice.org - interface in Chinese language for China
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku chińskim dla Chin
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-zh
 Obsoletes:     openoffice-i18n-zh_CN
 Obsoletes:     openoffice-i18n-zh_CN-gtk
@@ -1978,8 +2058,8 @@ chińskim dla Chin.
 %package i18n-zh_TW
 Summary:       OpenOffice.org - interface in Chinese language for Taiwan
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku chińskim dla Tajwanu
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-zh
 Obsoletes:     openoffice-i18n-zh_TW
 Obsoletes:     openoffice-i18n-zh_TW-gtk
@@ -1997,8 +2077,8 @@ chińskim dla Tajwanu.
 %package i18n-zu
 Summary:       OpenOffice.org - interface in Zulu language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku zuluskim
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Group:         I18n
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:     openoffice-i18n-zu
 Obsoletes:     openoffice-i18n-zu-gtk
 Obsoletes:     openoffice.org-i18n-zu-gtk
@@ -2026,55 +2106,51 @@ bash-completion for OpenOffice.org.
 bashowe uzupełnianie nazw dla Openoffice.org.
 
 %prep
-%setup -q -n ooo-build-%{ooobver}
-
+%setup -q -n ooo-build
 install -d src
-cp %{SOURCE50} %{SOURCE51} src
 
-# sources, icons, KDE_icons
+# sources, icons, KDE_icons. You can verify that all needed sources
+# are here by running ./download script manually after rpmbuild -bp
 ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
        %{SOURCE10} %{SOURCE11} %{SOURCE12} \
-       %{SOURCE15} %{SOURCE16} %{SOURCE17} src
+       %{SOURCE15} %{SOURCE16} %{SOURCE17} \
+       %{SOURCE18} %{SOURCE19} \
+       %{SOURCE22} \
+       %{SOURCE23} \
+       src
 
 # fixes for the patch subsystem
 %patch0 -p1
 
-# teach configure.in about PLD
-%patch1 -p1
+# mdbtools_fix.diff needs review
+#%patch50 -p1
+#
+# nodictinst patch needs review
+#%if %{with system_myspell}
+#%patch51 -p1
+#%endif
 
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%if %{with system_myspell}
-%patch7 -p1
-%endif
+ln -s %{PATCH1} patches/hotfixes/%{basename:%{PATCH1}}.diff
 
-# 64 bit related patches (not applied now)
-install %{PATCH100} patches/64bit
-install %{PATCH101} patches/64bit/64bit-inline.diff
+# TODO: use patches/hotfixes dir from now on
+echo "[ PLDOnly ]" >> patches/src680/apply
 
-%ifarch %{x8664}
-echo "[ PLD64bitfixes ]" >> patches/src680/apply
-# patches applied by ooo (extension .diff is required)
-for P in %{PATCH107}; do
-       PATCHNAME=PLD-${P##*/%{name}-}
-       PATCHNAME=${PATCHNAME%.patch}.diff
-       install $P patches/src680/$PATCHNAME
-       echo $PATCHNAME >> patches/src680/apply
-done
-%endif
+# remove patches (temporary FIX)
+%{__sed} -i -e "s/, STLport5, OOXSTLport5,/, /g" patches/src680/apply
 
-echo "[ PLDOnly ]" >> patches/src680/apply
 # patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH106} %{PATCH108} %{PATCH109}; do
+for P in \
+       %{PATCH100} %{PATCH103} %{PATCH104}; do
        PATCHNAME=PLD-${P##*/%{name}-}
        PATCHNAME=${PATCHNAME%.patch}.diff
-       install $P patches/src680/$PATCHNAME
+       ln -s $P patches/src680/$PATCHNAME
        echo $PATCHNAME >> patches/src680/apply
 done
 
+# from ooo-build itself
+echo "vcl_font-NO_LIST.diff" >> patches/src680/apply
+echo "linux-headers.diff" >> patches/src680/apply
+
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
 if [ ! -f /proc/cpuinfo ]; then
@@ -2082,6 +2158,22 @@ if [ ! -f /proc/cpuinfo ]; then
        exit 1
 fi
 
+# Skip optimization. It overwrites some OOo own hacks with -O0
+SAFE_CFLAGS=""
+for i in %{rpmcflags}; do
+       case "$i" in
+       -O?)
+               ;;
+       *)
+               SAFE_CFLAGS="$SAFE_CFLAGS $i"
+               ;;
+       esac
+done
+
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export CPP="%{__cpp}"
+
 %{__aclocal}
 %{__autoconf}
 
@@ -2091,11 +2183,6 @@ DISTRO="PLD64"
 DISTRO="PLD"
 %endif
 
-export CC="%{__cc}"
-export CXX="%{__cxx}"
-export ENVCFLAGS="%{rpmcflags}"
-# disable STLport 5.1 containers extension, doesn't work with map indexed by enum
-export ENVCFLAGSCXX="%{rpmcflags} -fpermissive -D_STLP_NO_CONTAINERS_EXTENSION"
 export DESTDIR=$RPM_BUILD_ROOT
 export IGNORE_MANIFEST_CHANGES=1
 export QTINC="%{_includedir}/qt"
@@ -2107,12 +2194,24 @@ export DB_JAR="%{_javadir}/db.jar"
 export ANT_HOME="%{_datadir}/ant"
 %endif
 
+%if %{with ccache}
+if [ "$CCACHE_DIR" = "" ] ; then
+       export CCACHE_DIR=$HOME/.ccache/
+fi
+%endif
+
 export DEFAULT_TO_ENGLISH_FOR_PACKING=1
 
 RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')"
 [ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
 RPM_BUILD_NR_THREADS=$(echo $RPM_BUILD_NR_THREADS)
 
+if [ -f %{_javadir}/serializer.jar ];then
+       serializer_jar=%{_javadir}/serializer.jar
+else
+       serializer_jar=%{_javadir}/xalan.jar
+fi
+
 CONFOPTS="\
 %ifarch %{ix86} \
        --with-arch=x86 \
@@ -2127,20 +2226,17 @@ CONFOPTS="\
        --with-arch=x86_64 \
 %endif
        --disable-odk \
-       --with-ccache-allowed \
+       %{?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_system_hsqldb:--with-system-hsqldb} \
        %{?with_system_hunspell:--with-system-hunspell --without-myspell-dicts} \
        %{?with_system_libhnj:--with-system-altlinuxhyphen} \
-       %{?with_system_mdbtools:--with-system-mdbtools} \
+       %{?with_msaccess:%{?with_system_mdbtools:--with-system-mdbtools}} \
        %{?with_system_myspell:--with-system-myspell} \
-%if %{with system_xalan}
-       --with-system-xalan \
-       --with-xalan-jar=%{_javadir}/xalan.jar \
-       `[ -e "%{_javadir}/serializer.jar" ] && echo "--with-serializer-jar=%{_javadir}/serializer.jar" || echo "--with-serializer-jar=%{_javadir}/xalan.jar"`
-%endif
+       %{?with_system_xalan:--with-system-xalan --with-xalan-jar=%{_javadir}/xalan.jar --with-serializer-jar=$serializer_jar} \
        %{?with_system_xerces:--with-system-xerces} \
        %{?with_system_xml_apis:--with-system-xml-apis} \
        %{?with_system_xt:--with-system-xt --with-xt-jar=%{_javadir}/classes} \
@@ -2150,13 +2246,17 @@ CONFOPTS="\
        --with-system-expat \
        --with-system-freetype \
        --with-system-gcc \
-       --with-system-icu \
+       --without-system-icu \
        --with-system-jpeg \
+       --with-system-libsvg \
        --with-system-libwpd \
+       --with-system-libwpg \
+       --with-system-libwps \
        --with-system-libxml \
        --with-system-nas \
        --with-system-neon \
        --with-system-odbc-headers \
+       --with-system-openssl \
        --with-system-portaudio \
        --with-system-python \
        --with-system-sablot \
@@ -2169,14 +2269,13 @@ CONFOPTS="\
        --with-system-xrender-headers=yes \
        --with-system-zlib \
 %if %{with mozilla}
-       --with-system-mozilla \
-       --with-xulrunner \
+       --with-system-mozilla=xulrunner \
 %else
        --disable-mozilla \
 %endif
        --with-dynamic-xinerama \
        --with-intro-bitmaps="\$SRCDIR/openintro_pld.bmp" \
-       --with-about-bitmaps="\$SRCDIR/openabout_pld.png" \
+       --with-about-bitmaps="\$SRCDIR/openabout_pld.bmp" \
        --with-distro="${DISTRO}" \
        --enable-gtk \
        --%{!?with_kde:dis}%{?with_kde:en}able-kde \
@@ -2190,6 +2289,7 @@ CONFOPTS="\
 %else
        --without-java \
        --with-system-libxslt \
+       --with-system-xmlsec \
 %endif
 %if %{with gnomevfs}
        --enable-gnome-vfs \
@@ -2198,22 +2298,30 @@ CONFOPTS="\
 %endif
        --with-docdir=%{_docdir}/%{name}-%{version} \
        --with-python=%{__python} \
-       --with-stlport=/usr \
+       --without-stlport \
        --with-x \
        --without-fonts \
        --without-gpc \
        --disable-epm \
        --disable-fontooo \
-       --enable-access \
+       --disable-strip \
+       --enable-openxml \
+       --enable-atkbridge \
+       --%{?with_msaccess:en}%{!?with_msaccess:dis}able-access \
        --enable-cairo \
        --enable-crypt-link \
-       --%{?with_mono:--en}%{!?with_mono:dis}able-mono \
+       --enable-dbus \
+       --%{?with_mono:en}%{!?with_mono:dis}able-mono \
        --enable-pam-link \
+       --enable-opengl \
        --enable-openldap \
+       --enable-openxml \
        --enable-cups \
        --enable-fontconfig \
        --enable-libsn \
        --enable-libart \
+       --enable-lockdown \
+       --enable-sdext \
        --disable-rpath \
 %if 0%{?debug:1}
        --enable-debug \
@@ -2223,8 +2331,13 @@ CONFOPTS="\
        --enable-crashdump=no \
        --disable-symbols \
 %endif
+       --disable-strip \
        --with-num-cpus=$RPM_BUILD_NR_THREADS \
-       --with-tag=%{ssnap}
+       --with-build-version=%{version}-%{release} \
+       --with-tag=%{tag} \
+       --with-drink=coffee \
+       --enable-split-app-modules \
+       --enable-split-opt-features
 "
 
 # build-ooo script will pickup these
@@ -2232,19 +2345,51 @@ export CONFIGURE_OPTIONS="$CONFOPTS"
 
 :> distro-configs/Common.conf
 :> distro-configs/Common.conf.in
-echo "$CONFOPTS" > distro-configs/PLD.conf.in
-echo "$CONFOPTS" > distro-configs/PLD64.conf.in
+echo -n "$CONFOPTS" > distro-configs/PLD.conf
+echo -n "$CONFOPTS" > distro-configs/PLD64.conf
+if [ $(cat distro-configs/PLD.conf | wc -l) -gt 1 ]; then
+       : 'newline(s) found in distro-configs. some of the options might be lost'
+       exit 1
+fi
 
 # for cvs snaps
 [ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
 
 # main build
-%configure \
-       $CONFOPTS
+# don't use %%configure here. We don't want cflags/ldflags to be set that way since
+# it breaks things (like preventing NOOPTFILES from working)
+./configure \
+               CC="$CC" \
+               CXX="$CXX" \
+               CPP="$CPP" \
+               --host=%{_target_platform} \
+               --build=%{_target_platform} \
+               --prefix=%{_prefix} \
+               --exec-prefix=%{_exec_prefix} \
+               --bindir=%{_bindir} \
+               --sbindir=%{_sbindir} \
+               --sysconfdir=%{_sysconfdir} \
+               --datadir=%{_datadir} \
+               --includedir=%{_includedir} \
+               --libdir=%{_libdir} \
+               --libexecdir=%{_libexecdir} \
+               --localstatedir=%{_localstatedir} \
+               --sharedstatedir=%{_sharedstatedir} \
+               --mandir=%{_mandir} \
+               --infodir=%{_infodir} \
+               --x-libraries=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
+               %{?configure_cache:--cache-file=%{configure_cache_file}} \
+               $CONFOPTS
+
+OOO_VENDOR="PLD/Linux Team"; export OOO_VENDOR
 
 # this limits processing some files but doesn't limit parallel build
 # processes of main OOo build (since OOo uses it's own build system)
-%{__make} -j1
+%{__make} -j1 \
+       ARCH_FLAGS="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" \
+       ARCH_FLAGS_CC="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" \
+       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
@@ -2257,40 +2402,67 @@ if [ $RPM_BUILD_NR_THREADS -gt 1 ]; then
 fi
 
 %install
-if [ ! -f installed.stamp -o ! -d $RPM_BUILD_ROOT ]; then
-       rm -rf $RPM_BUILD_ROOT
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+       rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+
+       # clean file listings
+       rm -f build/*_list.txt
 
        # limit to single process installation, it's safe at least
        %{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
 
        export DESTDIR=$RPM_BUILD_ROOT
        export TMP="%{tmpdir}"
+       export TMPDIR="%{tmpdir}"
        export TEMP="%{tmpdir}"
        export DEFAULT_TO_ENGLISH_FOR_PACKING=1
 
        %{__make} install \
                DESTDIR=$RPM_BUILD_ROOT
 
-       install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+       # save orignal install layout
+       find $RPM_BUILD_ROOT -ls > ls.txt
+       touch makeinstall.stamp
+fi
 
-       # Add in the regcomp tool since some people need it for 3rd party add-ons
-       cp -f build/%{ssnap}/solver/%{subver}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
+if [ ! -f installed.stamp ]; then
+       # do we need those? large comparing to png
+       rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/*.svg
 
-       # fix python
-       sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g' $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.py
+       # is below comment true?
+       # OOo should not install the Vera fonts, they are Required: now
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
+
+       # some libs creep in somehow
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstl*.so*
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libsndfile*
+       #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libgcc3_uno.so*
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstdc++*so*
+
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/sopatchlevel.sh
 
-       # Really needed?
-       install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+       # Remove setup log
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup.log
+
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
+       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
+
+       %if %{without java}
+       # Java-releated bits
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/hid.lst
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/java-set-classpath
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/jvmfwk3rc
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
+       %endif
 
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/kde
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/cde
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/gnome
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/icons
-       rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
-       rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome
+       %if %{with mono}
+       rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mono-ooo-2.1.pc
+       %endif
 
        # Remove dictionaries (in separate pkg)
-       rm -vf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
+       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
        %if %{with system_myspell}
        rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
        ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
@@ -2303,52 +2475,52 @@ if [ ! -f installed.stamp -o ! -d $RPM_BUILD_ROOT ]; then
        ln -s %{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
        %endif
 
-       # is below comment true?
-       # OOo should not install the Vera fonts, they are Required: now
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
-
-       # Copy fixed OpenSymbol to correct location
-       install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
-       install build/%{ssnap}/extras/source/truetype/symbol/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
-
-       # We don't need spadmin (gtk) or the setup application
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/setup
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/crash_report.bin
-       rm -f $RPM_BUILD_ROOT%{_desktopdir}/openoffice-setup.desktop
-       rm -f $RPM_BUILD_ROOT%{_desktopdir}/openoffice-printeradmin.desktop
-
-       #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/gnomeint
+       # configs
+       install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+       mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/sofficerc
+       ln -s %{_sysconfdir}/%{name}/sofficerc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
 
-       # some libs creep in somehow
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstl*.so*
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libsndfile*
+       # This breaks apps: The application cannot be started. The component manager is not available.
+       # Probably due to relative paths in unorc.
+       # mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/unorc
+       # ln -s %{_sysconfdir}/%{name}/unorc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+       # Use this instead:
+       ln -s %{_libdir}/%{name}/program/unorc $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/unorc
 
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/sopatchlevel.sh
        perl -pi -e 's/^[       ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
                $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup
 
-       # Remove setup log
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup.log
+       chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
 
-       # Remove copied system libraries
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libgcc_s.so* \
-               $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstdc++*so*
+       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}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
+       ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
+       # more non-archidecture dependant nature data
+       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name}
+       ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
+       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses $RPM_BUILD_ROOT%{_datadir}/%{name}
+       ln -s ../../share/%{name}/licenses $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses
+       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
+       ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
 
-       chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
+       # fix python
+       sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g' $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.py
 
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
-       rm -rf $RPM_BUILD_ROOT/opt/gnome
-       rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
+       # Copy fixed OpenSymbol to correct location
+       install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
+       install build/%{tag}/extras/source/truetype/symbol/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
 
-       %if %{without java}
-       # Java-releated bits
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/hid.lst
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/java-set-classpath
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/jvmfwk3rc
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
-       rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
-       %endif
+       # Add in the regcomp tool since some people need it for 3rd party add-ons
+       cp -a build/%{tag}/solver/%{upd}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
+
+       # Rename .desktop files to avoid conflicts with other applications .desktops
+       # TODO: make patch instead.
+       for a in $RPM_BUILD_ROOT%{_desktopdir}/*.desktop; do
+               d=$(dirname "$a")
+               f=$(basename "$a")
+               mv $a $d/oo$f
+       done
 
        touch installed.stamp
 fi
@@ -2411,10 +2583,11 @@ find_lang() {
                # lib/openoffice.org/share/samples/$lang
                grep "/share/samples/${lang}$" ${lfile} >> ${lang}.lang || :
                grep "/share/samples/${lang}/" ${lfile} >> ${lang}.lang || :
-               %if %{with java}
                grep "/help/${lang}$" ${lfile} >> ${lang}.lang || :
                grep "/help/${lang}/" ${lfile} >> ${lang}.lang || :
-               %endif
+               grep "/share/config/soffice.cfg/modules/swform/accelerator/${lang}/" build/common_list.txt >> ${lang}.lang || :
+               grep "/share/config/soffice.cfg/modules/swreport/accelerator/${lang}/" build/common_list.txt >> ${lang}.lang || :
+               grep "/share/config/soffice.cfg/modules/swxform/accelerator/${lang}/" build/common_list.txt >> ${lang}.lang || :
        fi
 }
 
@@ -2425,25 +2598,31 @@ for lang in $langlist; do
        find_lang $lang
 done
 
-# put share to %{_datadir} so we're able to produce noarch packages
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
-%{__sed} -i -e 's,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,' *.lang
+%{__sed} -i -e '
+       s,%{_libdir}/%{name}/help,%{_datadir}/%{name}/help,;
+       s,%{_libdir}/%{name}/licenses,%{_datadir}/%{name}/licenses,;
+       s,%{_libdir}/%{name}/readmes,%{_datadir}/%{name}/readmes,;
+       s,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,;
+' *.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre core
+%pretrans core
 %if %{with system_myspell}
 # we symlink the dir, unless smb wishes to patch OOo to use system dir directly
 if [ -d %{_libdir}/%{name}/share/dict/ooo ] && [ ! -L %{_libdir}/%{name}/share/dict/ooo ]; then
        rmdir %{_libdir}/%{name}/share/dict/ooo 2>/dev/null || mv -v %{_libdir}/%{name}/share/dict/ooo{,.rpmsave} || :
 fi
 %endif
-if [ -d %{_libdir}/%{name}/share ] && [ ! -L %{_libdir}/%{name}/share ]; then
-       install -d %{_datadir}/%{name}
-       mv %{_libdir}/%{name}/share %{_datadir}/%{name}/share || mv %{_libdir}/%{name}/share{,.rpmsave}
+for d in share %{?with_java:help} readmes licenses; do
+       if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
+               install -d %{_datadir}/%{name}
+               mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d || mv %{_libdir}/%{name}/$d{,.rpmsave}
+       fi
+done
+if [ -L %{_libdir}/%{name}/presets ]; then
+       rm -f %{_libdir}/%{name}/presets
 fi
 
 %post core
 %doc %{_libdir}/%{name}/LICENSE*
 %doc %{_libdir}/%{name}/*README*
 
-%dir %{_sysconfdir}/openoffice.org
-%dir %{_libdir}/%{name}
+# TODO: check where these really belong
+%attr(755,root,root) %{_libdir}/%{name}/program/OGLTrans.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbf_go680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdeploymentmisc680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvbaobj680*.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/bootstrap.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/stringresource680*.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/updatefeed.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fastsax.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libacc680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libaffine_uno_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbasebmp680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbf_sb680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libbf_so680*.so
+%{!?with_system_db:%attr(755,root,root) %{_libdir}/%{name}/program/libdb-4.2.so}
+%attr(755,root,root) %{_libdir}/%{name}/program/libguesslang680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libhelplinker680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblog680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liblpsolve*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libmtfrenderer.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/liboox680*.so
 %if %{with java}
-%dir %{_libdir}/%{name}/help/en
-%dir %{_libdir}/%{name}/program/classes
+%attr(755,root,root) %{_libdir}/%{name}/program/librpt680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librptui680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/librptxml680*.so
 %endif
+%attr(755,root,root) %{_libdir}/%{name}/program/libsax680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libt602filter680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libtextcat.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libunsafe_uno_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_svp680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwpgimport680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libwriterfilter680*.so
+# maybe external is possible?
+%attr(755,root,root) %{_libdir}/%{name}/program/libxmlsec1*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/oosplash.bin
+%attr(755,root,root) %{_libdir}/%{name}/program/simplecanvas.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/scsolver.uno.so
+%{_datadir}/%{name}/share/config/images_tango.zip
+%{_datadir}/%{name}/share/registry/data/org/openoffice/UserProfile.xcu
+%{_libdir}/%{name}/program/root3.dat
+%{_libdir}/%{name}/program/root4.dat
+%{_libdir}/%{name}/program/root5.dat
+%{_libdir}/%{name}/program/resource/acc680en-US.res
+%{_libdir}/%{name}/program/resource/chartcontroller680en-US.res
+%if %{with java}
+%{_libdir}/%{name}/program/resource/rpt680en-US.res
+%{_libdir}/%{name}/program/resource/rptui680en-US.res
+%endif
+%{_libdir}/%{name}/program/resource/sb680en-US.res
+
+%{_libdir}/%{name}/program/resource/scsolver680en-US.res
+%{_libdir}/%{name}/program/resource/sdbcl680en-US.res
+%{_libdir}/%{name}/program/resource/t602filter680en-US.res
+%{_datadir}/%{name}/share/config/javasettingsunopkginstall.xml
+
+%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swform
+%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/accelerator
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/accelerator/en-US
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/toolbar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/statusbar
+%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport
+%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/accelerator
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/statusbar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/toolbar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/accelerator/en-US
+%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform
+%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/accelerator
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/statusbar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/toolbar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/accelerator/en-US
+
+
+%dir %{_sysconfdir}/%{name}
+%{_libdir}/%{name}/program/sofficerc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/sofficerc
+
+%{_sysconfdir}/%{name}/unorc
+%config(noreplace) %verify(not md5 mtime size) %{_libdir}/%{name}/program/unorc
+
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/program
 %dir %{_libdir}/%{name}/program/resource
 
 %attr(755,root,root) %{_libdir}/%{name}/install-dict
 %{_libdir}/%{name}/program/*.rdb
 %{_libdir}/%{name}/program/*.bmp
-%{_libdir}/%{name}/program/sofficerc
-%{_libdir}/%{name}/program/unorc
 %{_libdir}/%{name}/program/bootstraprc
 %{_libdir}/%{name}/program/configmgrrc
-%dir %{_libdir}/%{name}/licenses
-%dir %{_libdir}/%{name}/readmes
 
-# symlink
+# symlinks
+%{_libdir}/%{name}/licenses
+%{_libdir}/%{name}/readmes
 %{_libdir}/%{name}/share
 
 %dir %{_datadir}/%{name}
@@ -2598,6 +2853,7 @@ fi
 %{?with_system_myspell:%{_datadir}/%{name}/share/dict/ooo}
 %{!?with_system_myspell:%ghost %{_datadir}/%{name}/share/dict/ooo/dictionary.lst}
 %{_datadir}/%{name}/share/dtd
+%{_datadir}/%{name}/share/fingerprint
 %{_datadir}/%{name}/share/fonts
 %{_datadir}/%{name}/share/gallery
 %{_datadir}/%{name}/share/psprint
@@ -2615,21 +2871,25 @@ fi
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Inet.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/LDAP.xcu.sample
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Calc.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Canvas.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Common.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Compatibility.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/DataAccess.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Embedding.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/ExtensionManager.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/FormWizard.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Impress.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Jobs.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Labels.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Logging.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Math.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Paths.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/ProtocolHandler.xcu
-%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/SFX.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Scripting.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Security.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/SFX.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/TableWizard.xcu
-%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -2640,6 +2900,7 @@ fi
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2647,8 +2908,13 @@ fi
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI.xcu
+%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Views.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/WebWizard.xcu
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/Writer.xcu
@@ -2660,8 +2926,9 @@ fi
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Inet.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/LDAP.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Addons.xcs
-%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Calc.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/CalcAddIns.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Calc.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Canvas.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Chart.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Commands.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Common.xcs
@@ -2670,25 +2937,28 @@ fi
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Draw.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Embedding.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Events.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/ExtensionManager.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/FormWizard.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Impress.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Java.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Jobs.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Labels.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Linguistic.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Logging.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Math.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/OptionsDialog.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Paths.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Recovery.xcs
-%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/SFX.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/ReportDesign.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Scripting.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Security.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/SFX.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Substitution.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/TabBrowse.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/TableWizard.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/TypeDetection.xcs
-%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
@@ -2702,6 +2972,7 @@ fi
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
@@ -2710,13 +2981,18 @@ fi
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Views.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/WebWizard.xcs
-%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Writer.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/WriterWeb.xcs
+%{_datadir}/%{name}/share/registry/schema/org/openoffice/Office/Writer.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/Setup.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/System.xcs
 %{_datadir}/%{name}/share/registry/schema/org/openoffice/TypeDetection/Filter.xcs
@@ -2735,6 +3011,7 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-CN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-TW.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ar.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_dz.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_fa.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_gu-IN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_he.xcu
@@ -2745,7 +3022,7 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_pa-IN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ta-IN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_th.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_vi.xcu
+#%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_vi.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
@@ -2755,12 +3032,14 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-draw.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-impress.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-math.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-report.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-writer.xcu
 # move it to -writer ?
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
+# move to locale pkgs?
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-af.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ar.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-as-IN.xcu
@@ -2776,6 +3055,7 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-cy.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-da.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-de.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-dz.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-el.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-en-GB.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
@@ -2797,7 +3077,7 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-it.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ja.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-km.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-kn-IN.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-kn.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ko.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ku.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-lo.xcu
@@ -2820,16 +3100,16 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-pt.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ru.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-rw.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sh-YU.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sh.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sk.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sr-CS.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sr.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ss.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-st.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sv.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sw-TZ.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sw.xcu
-%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sx.xcu
+#%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-sx.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ta-IN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-te-IN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-tg.xcu
@@ -2840,12 +3120,15 @@ fi
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ts.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-uk.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ur-IN.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-uz.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ve.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-vi.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-xh.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-zh-CN.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-zh-TW.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-zu.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Langpack-ka.xcu
+%{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Setup-report.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_base_filters.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_chart_filters.xcu
@@ -2883,6 +3166,7 @@ fi
 %attr(755,root,root) %{_bindir}/ooffice
 %attr(755,root,root) %{_bindir}/oofromtemplate
 %attr(755,root,root) %{_bindir}/ootool
+%attr(755,root,root) %{_bindir}/unopkg
 
 %attr(755,root,root) %{_libdir}/%{name}/program/configimport.bin
 %attr(755,root,root) %{_libdir}/%{name}/program/gengal.bin
@@ -2895,7 +3179,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/uno
 %attr(755,root,root) %{_libdir}/%{name}/program/uno.bin
 %attr(755,root,root) %{_libdir}/%{name}/program/unopkg.bin
-%attr(755,root,root) %{_libdir}/%{name}/program/ooqstart
+#%attr(755,root,root) %{_libdir}/%{name}/program/ooqstart
 %attr(755,root,root) %{_libdir}/%{name}/program/pagein*
 %attr(755,root,root) %{_libdir}/%{name}/program/regcomp
 %attr(755,root,root) %{_libdir}/%{name}/program/regcomp.bin
@@ -2914,20 +3198,33 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/viewdoc
 %{_libdir}/%{name}/program/versionrc
 
+%if %{with mono}
+%{_libdir}/%{name}/program/cli_basetypes.dll
+%{_libdir}/%{name}/program/cli_cppuhelper.dll
+%{_libdir}/%{name}/program/cli_types.dll
+%{_libdir}/%{name}/program/cli_uno_bridge.dll
+%{_libdir}/%{name}/program/cli_ure.dll
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno_glue.so
+%endif
+
+%{_libdir}/%{name}/help
+%dir %{_datadir}/%{name}/help
+%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.*
+%{_datadir}/%{name}/help/*.xsl
+
 %if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/javaldx
 %attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
 %{_libdir}/%{name}/program/jvmfwk3rc
 %{_libdir}/%{name}/program/JREProperties.class
 
-%dir %{_libdir}/%{name}/help
-%{_libdir}/%{name}/help/en/*.html
-%{_libdir}/%{name}/help/en/*.css
-%{_libdir}/%{name}/help/en/sbasic.*
-%{_libdir}/%{name}/help/en/schart.*
-%{_libdir}/%{name}/help/en/shared.*
-%{_libdir}/%{name}/help/*.xsl
-
+%dir %{_libdir}/%{name}/program/classes
 %{_libdir}/%{name}/program/classes/ScriptFramework.jar
 %{_libdir}/%{name}/program/classes/ScriptProviderForBeanShell.jar
 %{_libdir}/%{name}/program/classes/ScriptProviderForJava.jar
@@ -2942,7 +3239,7 @@ fi
 %{_libdir}/%{name}/program/classes/form.jar
 %{!?with_system_hsqldb:%{_libdir}/%{name}/program/classes/hsqldb.jar}
 %{_libdir}/%{name}/program/classes/java_uno.jar
-%{_libdir}/%{name}/program/classes/java_uno_accessbridge.jar
+#%{_libdir}/%{name}/program/classes/java_uno_accessbridge.jar
 %{_libdir}/%{name}/program/classes/js.jar
 %{_libdir}/%{name}/program/classes/juh.jar
 %{_libdir}/%{name}/program/classes/jurt.jar
@@ -2976,20 +3273,28 @@ fi
 %{_datadir}/%{name}/share/xslt/export/spreadsheetml
 %{_datadir}/%{name}/share/xslt/export/wordml
 %{_datadir}/%{name}/share/xslt/import
+%{_datadir}/%{name}/share/xslt/odfflatxml
+%{_datadir}/%{name}/share/xslt/wiki
 %endif
 
 %{_datadir}/mime/packages/openoffice.xml
 
-%{_desktopdir}/template.desktop
+%{_desktopdir}/ootemplate.desktop
+%{_desktopdir}/ooooo-extension-manager.desktop
 
+%{_iconsdir}/hicolor/*/apps/ooo-gulls.png
+%{_iconsdir}/hicolor/*/apps/ooo-printeradmin.png
+%{_iconsdir}/hicolor/*/apps/ooo-template.png
 %{_pixmapsdir}/ooo-gulls.png
 %{_pixmapsdir}/ooo-template.png
 
 %{_mandir}/man1/ooffice.1
 %{_mandir}/man1/oofromtemplate.1
 %{_mandir}/man1/openoffice.1*
+%{_mandir}/man1/unopkg.1*
 
 # en-US
+# TODO: use find lang for en-US too?
 %{_libdir}/%{name}/presets/config/*_en-US.so*
 %{_datadir}/%{name}/share/autocorr/acor_*.dat
 %{_datadir}/%{name}/share/autotext/en-US
@@ -3008,7 +3313,7 @@ fi
 %{_libdir}/%{name}/program/resource/bf_sc680en-US.res
 %{_libdir}/%{name}/program/resource/bf_sch680en-US.res
 %{_libdir}/%{name}/program/resource/bf_sd680en-US.res
-%{_libdir}/%{name}/program/resource/bf_sfx680en-US.res
+#%{_libdir}/%{name}/program/resource/bf_sfx680en-US.res
 %{_libdir}/%{name}/program/resource/bf_svx680en-US.res
 %{_libdir}/%{name}/program/resource/bf_sw680en-US.res
 %{_libdir}/%{name}/program/resource/bib680en-US.res
@@ -3042,8 +3347,9 @@ fi
 %{_libdir}/%{name}/program/resource/productregistration680en-US.res
 %{_libdir}/%{name}/program/resource/san680en-US.res
 %{_libdir}/%{name}/program/resource/sc680en-US.res
-%{_libdir}/%{name}/program/resource/sch680en-US.res
+#%{_libdir}/%{name}/program/resource/sch680en-US.res
 %{_libdir}/%{name}/program/resource/sd680en-US.res
+%{_libdir}/%{name}/program/resource/sdberr680en-US.res
 %{_libdir}/%{name}/program/resource/sdbt680en-US.res
 %{_libdir}/%{name}/program/resource/sfx680en-US.res
 %{_libdir}/%{name}/program/resource/spa680en-US.res
@@ -3062,10 +3368,13 @@ fi
 %{_libdir}/%{name}/program/resource/xmlsec680en-US.res
 %{_libdir}/%{name}/program/resource/xsltdlg680en-US.res
 
-%{_libdir}/%{name}/licenses/LICENSE_en-US
-%{_libdir}/%{name}/licenses/LICENSE_en-US.html
-%{_libdir}/%{name}/readmes/README_en-US
-%{_libdir}/%{name}/readmes/README_en-US.html
+%dir %{_datadir}/%{name}/licenses
+%{_datadir}/%{name}/licenses/LICENSE_en-US
+%{_datadir}/%{name}/licenses/LICENSE_en-US.html
+
+%dir %{_datadir}/%{name}/readmes
+%{_datadir}/%{name}/readmes/README_en-US
+%{_datadir}/%{name}/readmes/README_en-US.html
 
 %attr(755,root,root) %{_libdir}/%{name}/program/acceptor.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/basprov680*.uno.so
@@ -3086,7 +3395,7 @@ fi
 %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/implreg.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/implreg.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/introspection.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/invocadapt.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/invocation.uno.so
@@ -3100,7 +3409,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libbasctl680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbasegfx680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbf_frm680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libbf_lng680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libbf_lng680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbf_migratefilter680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbf_ofa680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbf_sch680*.so
@@ -3188,8 +3497,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/liblocaledata_others.so
 %attr(755,root,root) %{_libdir}/%{name}/program/liblwpft680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmcnttype.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libmdb680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libmdbimpl680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libmdb680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libmdbimpl680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmsworks680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmysql2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libodbc2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libodbcbase2.so
@@ -3197,7 +3507,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libpackage2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpcr680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpdffilter680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libpk680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libpk680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpl680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpreload680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libprotocolhandler680*.so
@@ -3206,8 +3516,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/librecentfile.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libres680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsb680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libsch680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libschd680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libsch680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libschd680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libscn680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libscriptframe.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsd680*.so
@@ -3216,7 +3526,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libsdd680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsdui680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsfx680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libso680*.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/libso680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsot680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libspa680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libspell680*.so
@@ -3235,7 +3545,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libtl680*.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/libucbhelper3gcc3.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libucbhelper4gcc3.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
@@ -3265,30 +3575,31 @@ fi
 %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/namingservice.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/nestedreg.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/nestedreg.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/passwordcontainer.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/productregistration.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/proxyfac.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/reflection.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/regtypeprov.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/regtypeprov.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/remotebridge.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/sax.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/security.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/servicemgr.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/shlibloader.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/simplereg.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/security.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/servicemgr.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/shlibloader.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/simplereg.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/slideshow.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/streams.uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/stocservices.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/svtmisc.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/sysmgr1.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/syssh.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/textinstream.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/textoutstream.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/typeconverter.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/typemgr.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/typeconverter.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/typemgr.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/ucpexpand1.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/ucptdoc1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/uriproc.uno.so
+#%attr(755,root,root) %{_libdir}/%{name}/program/uriproc.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/uuresolver.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/vbaevents680*.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/vclcanvas.uno.so
@@ -3334,7 +3645,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/kde-open-url
 %attr(755,root,root) %{_libdir}/%{name}/program/kdebe1.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/kdefilepicker
-%attr(755,root,root) %{_libdir}/%{name}/program/libfps_kde.so
+%attr(755,root,root) %{_libdir}/%{name}/program/fps_kde.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libkabdrv1.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde*.so
 %endif
@@ -3357,16 +3668,18 @@ fi
 %attr(755,root,root) %{_bindir}/oobase
 %attr(755,root,root) %{_libdir}/%{name}/program/sbase
 %{_mandir}/man1/oobase.1
-%{_desktopdir}/base.desktop
+%{_desktopdir}/oobase.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-base.png
 %{_pixmapsdir}/ooo-base.png
 %{_libdir}/%{name}/program/resource/cnr680en-US.res
-%if %{with java}
-%{_libdir}/%{name}/help/en/sdatabase.*
-%endif
+%{_datadir}/%{name}/help/en/sdatabase.*
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbquery
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbrelation
+%if %{with java}
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbreport
+%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtable
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
@@ -3383,14 +3696,17 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libdate680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsc680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libscd680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libchartcontroller680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libchartmodel680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcharttools680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libchartview680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libscui680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/scalc
 %{_mandir}/man1/oocalc.1
-%{_desktopdir}/calc.desktop
+%{_desktopdir}/oocalc.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-calc.png
 %{_pixmapsdir}/ooo-calc.png
-%if %{with java}
-%{_libdir}/%{name}/help/en/scalc.*
-%endif
+%{_datadir}/%{name}/help/en/scalc.*
 %{_libdir}/%{name}/program/resource/analysis680en-US.res
 %{_libdir}/%{name}/program/resource/bf_sc680en-US.res
 %{_libdir}/%{name}/program/resource/date680en-US.res
@@ -3411,11 +3727,10 @@ fi
 %attr(755,root,root) %{_bindir}/oodraw
 %attr(755,root,root) %{_libdir}/%{name}/program/sdraw
 %{_mandir}/man1/oodraw.1
-%{_desktopdir}/draw.desktop
+%{_desktopdir}/oodraw.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-draw.png
 %{_pixmapsdir}/ooo-draw.png
-%if %{with java}
-%{_libdir}/%{name}/help/en/sdraw.*
-%endif
+%{_datadir}/%{name}/help/en/sdraw.*
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-draw.xcu
@@ -3438,10 +3753,11 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libwpft680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/swriter
 %{_mandir}/man1/oowriter.1
-%{_desktopdir}/writer.desktop
+%{_desktopdir}/oowriter.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-writer.png
 %{_pixmapsdir}/ooo-writer.png
+%{_datadir}/%{name}/help/en/swriter.*
 %if %{with java}
-%{_libdir}/%{name}/help/en/swriter.*
 %{_libdir}/%{name}/program/classes/writer2latex.jar
 %endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter
@@ -3470,11 +3786,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libplaceware*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/simpress
 %{_mandir}/man1/ooimpress.1
-%{_desktopdir}/impress.desktop
+%{_desktopdir}/ooimpress.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-impress.png
 %{_pixmapsdir}/ooo-impress.png
-%if %{with java}
-%{_libdir}/%{name}/help/en/simpress.*
-%endif
+%{_datadir}/%{name}/help/en/simpress.*
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress
 %{_datadir}/%{name}/share/config/soffice.cfg/simpress/
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -3493,11 +3808,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libsmd680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/smath
 %{_mandir}/man1/oomath.1
-%{_desktopdir}/math.desktop
+%{_desktopdir}/oomath.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-math.png
 %{_pixmapsdir}/ooo-math.png
-%if %{with java}
-%{_libdir}/%{name}/help/en/smath.*
-%endif
+%{_datadir}/%{name}/help/en/smath.*
 %{_libdir}/%{name}/program/resource/bf_sm680en-US.res
 %{_libdir}/%{name}/program/resource/sm680en-US.res
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath
@@ -3514,7 +3828,8 @@ fi
 %attr(755,root,root) %{_bindir}/ooweb
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb
 %{_mandir}/man1/ooweb.1
-%{_desktopdir}/web.desktop
+%{_desktopdir}/ooweb.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-web.png
 %{_pixmapsdir}/ooo-web.png
 
 %files graphicfilter
@@ -3580,9 +3895,9 @@ fi
 %if %{with mozilla}
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
 %attr(755,root,root) %{_browserpluginsdir}/libnpsoplugin.so
-%{_libdir}/%{name}/program/libnpsoplugin.so
+%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
+%attr(755,root,root) %{_libdir}/%{name}/program/libnpsoplugin.so
 %endif
 
 %if %{with i18n}
@@ -3631,6 +3946,9 @@ fi
 %files i18n-de -f de.lang
 %defattr(644,root,root,755)
 
+%files i18n-dz -f dz.lang
+%defattr(644,root,root,755)
+
 %files i18n-el -f el.lang
 %defattr(644,root,root,755)
 
@@ -3697,10 +4015,13 @@ fi
 %files i18n-ja -f ja.lang
 %defattr(644,root,root,755)
 
+%files i18n-ka -f ka.lang
+%defattr(644,root,root,755)
+
 %files i18n-km -f km.lang
 %defattr(644,root,root,755)
 
-%files i18n-kn_IN -f kn-IN.lang
+%files i18n-kn_IN -f kn.lang
 %defattr(644,root,root,755)
 
 %files i18n-ko -f ko.lang
@@ -3781,7 +4102,7 @@ fi
 %files i18n-rw -f rw.lang
 %defattr(644,root,root,755)
 
-%files i18n-sh -f sh-YU.lang
+%files i18n-sh -f sh.lang
 %defattr(644,root,root,755)
 
 %files i18n-sk -f sk.lang
@@ -3790,7 +4111,7 @@ fi
 %files i18n-sl -f sl.lang
 %defattr(644,root,root,755)
 
-%files i18n-sr -f sr-CS.lang
+%files i18n-sr -f sr.lang
 %defattr(644,root,root,755)
 
 %files i18n-ss -f ss.lang
@@ -3808,8 +4129,8 @@ fi
 %files i18n-sw_TZ -f sw-TZ.lang
 %defattr(644,root,root,755)
 
-%files i18n-sx -f sx.lang
-%defattr(644,root,root,755)
+#%files i18n-sx -f sx.lang
+#%defattr(644,root,root,755)
 
 %files i18n-ta_IN -f ta-IN.lang
 %defattr(644,root,root,755)
@@ -3841,6 +4162,9 @@ fi
 %files i18n-ur_IN -f ur-IN.lang
 %defattr(644,root,root,755)
 
+%files i18n-uz -f uz.lang
+%defattr(644,root,root,755)
+
 %files i18n-ve -f ve.lang
 %defattr(644,root,root,755)
 
This page took 0.209568 seconds and 4 git commands to generate.