update to 6.4.6.1 [release 6.4.6.1-1mamba;Mon Jul 27 2020]
This commit is contained in:
parent
88e2b0301b
commit
2a9880ff76
@ -28,8 +28,8 @@
|
||||
%define langpacks 1
|
||||
|
||||
Name: libreoffice
|
||||
Version: 6.4.3.2
|
||||
Release: 2mamba
|
||||
Version: 6.4.6.1
|
||||
Release: 1mamba
|
||||
Summary: Free Office Suite
|
||||
Group: Graphical Desktop/Applications/Office
|
||||
Vendor: openmamba
|
||||
@ -680,9 +680,9 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -b 2 -b 3 -b4 -a5
|
||||
#% setup -q -c -T -D
|
||||
#:<< ____EOF
|
||||
#% setup -q -b 2 -b 3 -b4 -a5
|
||||
%setup -q -c -T -D
|
||||
:<< ____EOF
|
||||
|
||||
#rm -rf libreoffice-*/git-hooks
|
||||
#for a in libreoffice-*/*; do mv $PWD/$a .; done
|
||||
@ -692,12 +692,8 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro
|
||||
#mv translations src
|
||||
|
||||
%patch12 -p1 -b .libreoffice-installfix.patch
|
||||
#%patch41 -p1
|
||||
#%patch42 -p1
|
||||
##%patch43 -p1
|
||||
#%patch44 -p1
|
||||
%patch45 -p1
|
||||
%patch46 -p1
|
||||
#%patch46 -p1
|
||||
|
||||
touch scripting/source/pyprov/delzip
|
||||
#touch scripting/util/provider/beanshell/delzip
|
||||
@ -729,39 +725,39 @@ if [ -e writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip ]; then \
|
||||
writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
|
||||
fi
|
||||
|
||||
# FIXME: WORKAROUND: disable failing tests
|
||||
sed -i -e "\
|
||||
/CppunitTest_emfio_emf_test/d;\
|
||||
/CppunitTest_chart2_import/d;\
|
||||
/CppunitTest_chart2_export/d;\
|
||||
/CppunitTest_chart2_pivot_chart_test/d;\
|
||||
/CppunitTest_sd_import_tests/d;\
|
||||
/CppunitTest_sd_misc_tests/d;\
|
||||
/CppunitTest_sd_export_ooxml2/d;\
|
||||
/CppunitTest_sd_export_tests/d;\
|
||||
/CppunitTest_sd_tiledrendering/d;\
|
||||
/CppunitTest_sd_export_ooxml1/d;\
|
||||
/CppunitTest_sc_filters_test/d;\
|
||||
/CppunitTest_sc_pivottable_filters_test/d;\
|
||||
/CppunitTest_sc_subsequent_export_test/d;\
|
||||
/CppunitTest_sccomp_swarmsolvertest/d;\
|
||||
/CppunitTest_sccomp_solver/d;\
|
||||
/CppunitTest_svx_unit/d;\
|
||||
/CppunitTest_sw_fodfexport/d;\
|
||||
/CppunitTest_sw_layoutwriter/d;\
|
||||
/CppunitTest_sw_ww8export2/d;\
|
||||
/CppunitTest_sw_ooxmlexport/d;\
|
||||
/CppunitTest_sw_ooxmlexport2/d;\
|
||||
/CppunitTest_sw_ooxmlexport7/d;\
|
||||
/CppunitTest_sw_ooxmlexport11/d;\
|
||||
/CppunitTest_sw_odfexport/d;\
|
||||
/CppunitTest_sw_rtfexport5/d;\
|
||||
/CppunitTest_sw_uiwriter/d;\
|
||||
/CppunitTest_tools_test/d;\
|
||||
/CppunitTest_xmlsecurity_signing/d;\
|
||||
" emfio/Module_emfio.mk sd/Module_sd.mk sc/Module_sc.mk sw/Module_sw.mk \
|
||||
xmlsecurity/Module_xmlsecurity.mk chart2/Module_chart2.mk \
|
||||
tools/Module_tools.mk sccomp/Module_sccomp.mk svx/Module_svx.mk
|
||||
## FIXME: WORKAROUND: disable failing tests
|
||||
#sed -i -e "\
|
||||
#/CppunitTest_emfio_emf_test/d;\
|
||||
#/CppunitTest_chart2_import/d;\
|
||||
#/CppunitTest_chart2_export/d;\
|
||||
#/CppunitTest_chart2_pivot_chart_test/d;\
|
||||
#/CppunitTest_sd_import_tests/d;\
|
||||
#/CppunitTest_sd_misc_tests/d;\
|
||||
#/CppunitTest_sd_export_ooxml2/d;\
|
||||
#/CppunitTest_sd_export_tests/d;\
|
||||
#/CppunitTest_sd_tiledrendering/d;\
|
||||
#/CppunitTest_sd_export_ooxml1/d;\
|
||||
#/CppunitTest_sc_filters_test/d;\
|
||||
#/CppunitTest_sc_pivottable_filters_test/d;\
|
||||
#/CppunitTest_sc_subsequent_export_test/d;\
|
||||
#/CppunitTest_sccomp_swarmsolvertest/d;\
|
||||
#/CppunitTest_sccomp_solver/d;\
|
||||
#/CppunitTest_svx_unit/d;\
|
||||
#/CppunitTest_sw_fodfexport/d;\
|
||||
#/CppunitTest_sw_layoutwriter/d;\
|
||||
#/CppunitTest_sw_ww8export2/d;\
|
||||
#/CppunitTest_sw_ooxmlexport/d;\
|
||||
#/CppunitTest_sw_ooxmlexport2/d;\
|
||||
#/CppunitTest_sw_ooxmlexport7/d;\
|
||||
#/CppunitTest_sw_ooxmlexport11/d;\
|
||||
#/CppunitTest_sw_odfexport/d;\
|
||||
#/CppunitTest_sw_rtfexport5/d;\
|
||||
#/CppunitTest_sw_uiwriter/d;\
|
||||
#/CppunitTest_tools_test/d;\
|
||||
#/CppunitTest_xmlsecurity_signing/d;\
|
||||
#" emfio/Module_emfio.mk sd/Module_sd.mk sc/Module_sc.mk sw/Module_sw.mk \
|
||||
# xmlsecurity/Module_xmlsecurity.mk chart2/Module_chart2.mk \
|
||||
# tools/Module_tools.mk sccomp/Module_sccomp.mk svx/Module_svx.mk
|
||||
|
||||
%build
|
||||
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
|
||||
@ -849,7 +845,7 @@ for i in $RPM_OPT_FLAGS; do
|
||||
done
|
||||
export ARCH_FLAGS
|
||||
|
||||
%make
|
||||
%make build-nocheck
|
||||
|
||||
make -C cli_ure
|
||||
#make -C unoil
|
||||
@ -2826,6 +2822,9 @@ This package contains additional Zulu translations and resources for LibreOffice
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jul 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.6.1-1mamba
|
||||
- update to 6.4.6.1
|
||||
|
||||
* Thu May 07 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.3.2-2mamba
|
||||
- remove requirement for java-lucene in favour of clucene
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user