pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Silence more scarry messages by bnc#900186

Browse Source 
* Fixes autocorr symlinking
  * Cleans UNO cache in more pretty way

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=245
This commit is contained in:
Tomáš Chvátal 2015-04-14 13:49:39 +00:00 committed by Git OBS Bridge
parent f0d1748c65
commit 1c744d33b5
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libreoffice.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Apr 14 13:49:22 UTC 2015 - tchvatal@suse.com
- Hopefully fix bnc#913042.Redo check phase that sometimes broke
.jar generating
-------------------------------------------------------------------
Tue Apr 14 13:43:32 UTC 2015 - tchvatal@suse.com
- Silence more scarry messages by bnc#900186
* Fixes autocorr symlinking
* Cleans UNO cache in more pretty way
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 9 13:12:21 UTC 2015 - tchvatal@suse.com Thu Apr 9 13:12:21 UTC 2015 - tchvatal@suse.com

23
libreoffice.spec
View File

@ -965,11 +965,9 @@ export NOCONFIGURE=yes
sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py
# just call make here as we added the jobs in configure # just call make here as we added the jobs in configure
make build-nocheck # The check phase is run here too if it is split with nocheck
# install of jars get broken sometimes
%check make VERBOSE=true
make unitcheck
make slowcheck
%install %install
make DESTDIR=%{buildroot} distro-pack-install make DESTDIR=%{buildroot} distro-pack-install
@ -1080,10 +1078,10 @@ done
%make_autocorr_aliases -l en-US en-PH %make_autocorr_aliases -l en-US en-PH
%make_autocorr_aliases -l en-ZA en-NA en-ZW %make_autocorr_aliases -l en-ZA en-NA en-ZW
%make_autocorr_aliases -l af-ZA af-NA %make_autocorr_aliases -l af-ZA af-NA
%make_autocorr_aliases -l de-DE de-AT de-BE de-CH de-LI de-LU %make_autocorr_aliases -l de de-DE de-AT de-BE de-CH de-LI de-LU
%make_autocorr_aliases -l es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE %make_autocorr_aliases -l es es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE
%make_autocorr_aliases -l fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC %make_autocorr_aliases -l fr fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC
%make_autocorr_aliases -l it-IT it-CH %make_autocorr_aliases -l it it-IT it-CH
%make_autocorr_aliases -l nl-NL nl-AW %make_autocorr_aliases -l nl-NL nl-AW
%make_autocorr_aliases -l sv-SE sv-FI %make_autocorr_aliases -l sv-SE sv-FI
pushd %{buildroot}%{_libdir}/%{name}/share/autocorr pushd %{buildroot}%{_libdir}/%{name}/share/autocorr
@ -1112,9 +1110,6 @@ for appdata in base calc draw impress writer; do
done done
%endif %endif
# 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 # Merge kde and kde4 filelists as we do not bother with compat anymore
# Not worth fixing unless really cleaning up the install completely # Not worth fixing unless really cleaning up the install completely
cat file-lists/kde_list.txt >> file-lists/kde4_list.txt cat file-lists/kde_list.txt >> file-lists/kde4_list.txt
@ -1152,9 +1147,9 @@ exit 0
%icon_theme_cache_post %icon_theme_cache_post
%preun %preun
uno_cache="%{_libdir}/%{name}/share/uno_packages/cache" uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/"
if [ "$1" = "0" ] ; then if [ "$1" = "0" ] ; then
test -d "$uno_cache" && rm -rf "$uno_cache" test -d "$uno_cache" && rm -rf "$uno_cache"/*
fi fi
exit 0 exit 0