- Use bsh2 not bsh1 for dep. Thanks to mvyskocil.

- More filelist moves for langpacks and extra files.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=70

libreoffice.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan  6 18:59:34 UTC 2014 - tchvatal@suse.com
+
+- Use bsh2 not bsh1 for dep. Thanks to mvyskocil. 
+
+-------------------------------------------------------------------
+Mon Jan  6 18:59:09 UTC 2014 - tchvatal@suse.com
+
+- More filelist moves for langpacks and extra files. 
+
 -------------------------------------------------------------------
 Sun Jan  5 20:07:46 UTC 2014 - tchvatal@suse.com
 

libreoffice.spec

@@ -119,7 +119,7 @@ BuildRequires:  autoconf
 BuildRequires:  bison
 BuildRequires:  bluez-devel
 BuildRequires:  boost-devel
-BuildRequires:  bsh
+BuildRequires:  bsh2
 BuildRequires:  clucene-core-devel
 BuildRequires:  commons-codec
 BuildRequires:  commons-httpclient
@@ -606,10 +606,14 @@ This package provides extensions for LibreOffice Writer:
 # Inspired and adjusted from Fedora spec.
 %define _langpack_common() \
 %{_datadir}/%{name}/program/resource/*%{1}.res \
+%if "%{1}" != "en-US" \
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \
 %{_datadir}/%{name}/share/config/soffice.cfg/*/ui/res/%{1}.zip \
+%endif \
 %{_datadir}/%{name}/share/registry/Langpack-%{1}.xcd \
+%if "%{1}" != "en-US" \
 %{_datadir}/%{name}/share/registry/res/registry_%{1}.xcd \
+%endif \
 %{_datadir}/%{name}/share/registry/res/fcfg_langpack_%{1}.xcd \
 %{nil}
 
@@ -702,7 +706,7 @@ Provides additional %{langname} translations and resources for %{project}. \
 %langpack -l de -n German -M -T -X
 %langpack -l dz -n Dzongkha -s ctl -T
 %langpack -l el -n Greek -M -T
-%langpack -l en -n English -M -L en-US
+%langpack -l en -n English -M -L en-US -T
 %langpack -l es -n Spanish -M -T -X
 %langpack -l et -n Estonian -T
 %langpack -l eu -n Basque -T
@@ -711,10 +715,10 @@ Provides additional %{langname} translations and resources for %{project}. \
 %langpack -l fr -n French -M -T -X
 %langpack -l ga -n Irish -M
 %langpack -l gl -n Galician -T
-%langpack -l gu -n Gujarati -s ctl
-%langpack -l he -n Hebrew -s ctl
+%langpack -l gu -n Gujarati -s ctl -H
+%langpack -l he -n Hebrew -s ctl -H
 %langpack -l hi -n Hindi -s ctl -T
-%langpack -l hr -n Croatian
+%langpack -l hr -n Croatian -H
 %langpack -l hu -n Hungarian -M -T -X
 %langpack -l it -n Italian -M -T -X
 %langpack -l ja -n Japanese -s cjk -T -X
@@ -744,8 +748,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %langpack -l si -n Sinhalese -S ctl -T
 %langpack -l sk -n Slovak -M -T -X
 %langpack -l sl -n Slovenian -M -T -X
-%{baseinstdir}/share/wordbook/sl.dic
-
 %langpack -l sr -n Serbian -i sr-Latn
 %langpack -l ss -n Swati
 %define langpack_lang Southern Sotho
@@ -881,6 +883,7 @@ export NOCONFIGURE=yes
         --without-fonts \
         --without-myspell-dicts \
         --with-jdk-home=$JAVA_HOME \
+        --with-beanshell-jar=%{_datadir}/java/bsh2/bsh.jar \
         --with-ant-home=%{_datadir}/ant \
         --with-external-dict-dir=%{_datadir}/myspell \
         --with-external-hyph-dir=%{_datadir}/ooo/hyphen \
@@ -980,6 +983,7 @@ for i in %{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/modules/*/ui/re
          %{buildroot}%{_libdir}/%{name}/program/resource/*.res \
          %{buildroot}%{_libdir}/%{name}/share/config/images*.zip \
          %{buildroot}%{_libdir}/%{name}/share/registry/{cjk,ctl}_*.xcd \
+	 %{buildroot}%{_libdir}/%{name}/share/registry/{korea,ctlseqcheck_th}.xcd \
         ; do
     trg="`dirname "$i" | sed 's|%{_libdir}|%{_datadir}|'`"
     mkdir -p "$trg"
@@ -996,6 +1000,13 @@ echo "%{_libdir}/%{name}/help" >> file-lists/common_list.txt
 for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do
     echo "%{_datadir}/%{name}/help/$file" >> file-lists/common_list.txt
 done
+# autotext is another self contained dir
+mkdir -p %{buildroot}/%{_datadir}/%{name}/autotext/
+grep -v '%{_libdir}/%{name}/share/autotext' file-lists/common_list.txt > tmplist
+mv tmplist file-lists/common_list.txt
+mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{name}/share/
+ln -s %{_datadir}/%{name}/share/autotext/ %{buildroot}/%{_libdir}/%{name}/share/autotext
+echo "%{_libdir}/%{name}/share/autotext" >> file-lists/common_list.txt
 
 ################
 # branding split
@@ -1037,6 +1048,16 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python_sitelib}/
 # Remove translations source as we need more space
 rm -rf translations/source/
 
+# Merge kde and kde4 filelists as we do not bother with compat anymore
+# Not worth fixing unless really cleaning up the install completely
+cat file-lists/kde_list.txt >> file-lists/kde4_list.txt
+
+# Unused theme
+rm -rf %{buildroot}%{_datadir}/%{name}/share/config/images_sifr.zip
+
+# Remove pointless readmes
+rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
+
 # We have ton of duped files so run over it
 %fdupes %{buildroot}/usr