Accepting request 296184 from LibreOffice:Factory
- Hopefully fix bnc#913042.Redo check phase that sometimes broke .jar generating - Silence more scarry messages by bnc#900186 * Fixes autocorr symlinking * Cleans UNO cache in more pretty way - Clean up the uno cache removal to not display scarry message bnc#900186 - Remove patch to look for help in /usr/share, we symlink it back to lib, so there is no actual need to search for it directly, migth fix bnc#915996: * officecfg-help-in-usr-share.diff OBS-URL: https://build.opensuse.org/request/show/296184 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=89
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
81d5fce607
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Clean up the uno cache removal to not display scarry message
|
||||
bnc#900186
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 9 12:42:00 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Remove patch to look for help in /usr/share, we symlink it back to
|
||||
lib, so there is no actual need to search for it directly, migth
|
||||
fix bnc#915996:
|
||||
* officecfg-help-in-usr-share.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 8 13:06:41 UTC 2015 - andras.timar@collabora.com
|
||||
|
||||
|
||||
@ -60,9 +60,6 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
# Needed for wiki-published and always taken as bundled
|
||||
Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
# search help icons in %{_prefix}/share
|
||||
# FIXME: make it configurable in integrate into git
|
||||
Patch0: officecfg-help-in-usr-share.diff
|
||||
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
|
||||
# to avoid BerkleyDB incompatibility with the plain build
|
||||
# FIXME: make it configurable and push upstream
|
||||
@ -838,7 +835,6 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
|
||||
%prep
|
||||
%setup -q -b1 -b2
|
||||
%patch0 -p1
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
@ -969,11 +965,9 @@ export NOCONFIGURE=yes
|
||||
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
|
||||
make build-nocheck
|
||||
|
||||
%check
|
||||
make unitcheck
|
||||
make slowcheck
|
||||
# The check phase is run here too if it is split with nocheck
|
||||
# install of jars get broken sometimes
|
||||
make VERBOSE=true
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} distro-pack-install
|
||||
@ -1084,10 +1078,10 @@ done
|
||||
%make_autocorr_aliases -l en-US en-PH
|
||||
%make_autocorr_aliases -l en-ZA en-NA en-ZW
|
||||
%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 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 it-IT it-CH
|
||||
%make_autocorr_aliases -l de de-DE de-AT de-BE de-CH de-LI de-LU
|
||||
%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 fr-BE fr-CA fr-CH fr-LU fr-MC
|
||||
%make_autocorr_aliases -l it it-IT it-CH
|
||||
%make_autocorr_aliases -l nl-NL nl-AW
|
||||
%make_autocorr_aliases -l sv-SE sv-FI
|
||||
pushd %{buildroot}%{_libdir}/%{name}/share/autocorr
|
||||
@ -1111,14 +1105,11 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}
|
||||
%if 0%{?suse_version} > 1315
|
||||
install -m 0755 -d %{buildroot}%{_datadir}/appdata
|
||||
for appdata in base calc draw impress writer; do
|
||||
sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \
|
||||
sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \
|
||||
sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml
|
||||
done
|
||||
%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
|
||||
# Not worth fixing unless really cleaning up the install completely
|
||||
cat file-lists/kde_list.txt >> file-lists/kde4_list.txt
|
||||
@ -1156,10 +1147,11 @@ exit 0
|
||||
%icon_theme_cache_post
|
||||
|
||||
%preun
|
||||
uno_cache="%{_libdir}/%{name}/share/uno_packages/cache"
|
||||
uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/"
|
||||
if [ "$1" = "0" ] ; then
|
||||
test -d "$uno_cache" && rm -rf "$uno_cache"/* || true;
|
||||
test -d "$uno_cache" && rm -rf "$uno_cache"/*
|
||||
fi
|
||||
exit 0
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
Index: libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
|
||||
===================================================================
|
||||
--- libreoffice-4.4.0.1.orig/officecfg/registry/data/org/openoffice/Office/Paths.xcu
|
||||
+++ libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
|
||||
@@ -98,7 +98,7 @@
|
||||
</node>
|
||||
<node oor:name="Help" oor:op="fuse" oor:mandatory="true">
|
||||
<node oor:name="InternalPaths">
|
||||
- <node oor:name="$(instpath)/@LIBO_SHARE_HELP_FOLDER@" oor:op="fuse"/>
|
||||
+ <node oor:name="/usr/share/help" oor:op="fuse"/>
|
||||
</node>
|
||||
</node>
|
||||
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
|
||||
Index: libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
===================================================================
|
||||
--- libreoffice-4.4.0.1.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
+++ libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
@@ -1615,7 +1615,7 @@
|
||||
<info>
|
||||
<desc>Specifies the path to the Office help files.</desc>
|
||||
</info>
|
||||
- <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
|
||||
+ <value>/usr/share/help</value>
|
||||
</prop>
|
||||
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
|
||||
<info>
|
||||
@@ -1810,7 +1810,7 @@
|
||||
<desc>Specifies the default directory where Office help files are
|
||||
located.</desc>
|
||||
</info>
|
||||
- <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
|
||||
+ <value>/usr/share/help</value>
|
||||
</prop>
|
||||
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
|
||||
<info>
|
||||
Loading…
x
Reference in New Issue
Block a user