diff options
Diffstat (limited to 'libreoffice.spec')
| -rw-r--r-- | libreoffice.spec | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/libreoffice.spec b/libreoffice.spec index 217eef5..601eea5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.5.2 +%global libo_version 7.5.5 %global vendoroption --with-vendor="%{_vendor}" %global libo_python python3 @@ -15,7 +15,7 @@ # so it is necessary to change this to bcond_with to achieve the same # effect %bcond_without langpacks -%bcond_without serverconfig +%bcond_with serverconfig # generated by %%langpack definitions %global langpack_langs %{nil} @@ -23,8 +23,8 @@ %global bundling_options %{nil} Summary: Free Software Productivity Suite -Name: libreoffice Epoch: 1 +Name: libreoffice Version: %{libo_version}.2 Release: 1 # default new files are: MPLv2 @@ -93,7 +93,7 @@ BuildRequires: pkgconfig(libabw-0.1) pkgconfig(libcdr-0.1) pkgconfig(libclucene- BuildRequires: pkgconfig(libetonyek-0.1) pkgconfig(libexttextcat) pkgconfig(libfreehand-0.1) pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) pkgconfig(libmwaw-0.3) pkgconfig(libodfgen-0.1) pkgconfig(libpagemaker-0.0) libpq-devel BuildRequires: pkgconfig(librevenge-0.0) pkgconfig(libstaroffice-0.0) pkgconfig(libtiff-4) pkgconfig(libvisio-0.1) pkgconfig(libwebp) -BuildRequires: pkgconfig(libwpd-0.10) pkgconfig(libwpg-0.3) pkgconfig(libwps-0.4) pkgconfig(libxml-2.0) pkgconfig(libxslt) +BuildRequires: pkgconfig(libwpd-0.10) pkgconfig(libwpg-0.3) pkgconfig(libwps-0.4) libxml2-devel pkgconfig(libxslt) BuildRequires: pkgconfig(libzmf-0.0) pkgconfig(mythes) pkgconfig(neon) pkgconfig(nss) pkgconfig(poppler) pkgconfig(poppler-cpp) BuildRequires: pkgconfig(mythes) pkgconfig(neon) pkgconfig(nss) pkgconfig(poppler) pkgconfig(poppler-cpp) pkgconfig(sane-backends) BuildRequires: redland redland-devel unixODBC-devel pkgconfig(sane-backends) pkgconfig(xext) pkgconfig(xinerama) @@ -130,12 +130,14 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch -Patch4: 0001-Use-sifr-and-sifr_dark-for-gnome.patch -Patch5: 0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch -Patch6: 0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch +Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch # TODO investigate these -Patch7: 0001-aarch64-failing-here.patch -Patch8: 0001-include-filename-if-the-test-fails.patch +Patch5: 0001-aarch64-failing-here.patch +Patch6: 0001-include-filename-if-the-test-fails.patch +# backported +Patch7: 0001-fix-testSignDocument_PEM_PDF.patch +Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch +Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -400,7 +402,7 @@ Summary: UNO Runtime Environment Requires: %{name}-ure-common = %{epoch}:%{version}-%{release} Requires: unzip%{?_isa} %ifarch %{java_arches} -# we want to ensure that a libjvm.so of this arch is available +#we want to ensure that a libjvm.so of this arch is available Requires: libjvm.so%{?mark64} %endif @@ -840,24 +842,6 @@ sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk # aarch64 sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # ppc64le sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # ppc64le sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk # s390x -# del some tests -#sed -i -e /CppunitTest_chart2_export2/d chart2/Module_chart2.mk -#sed -i -e /CppunitTest_chart2_import2/d chart2/Module_chart2.mk -#sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk -#sed -i -e /CppunitTest_vcl_text/d vcl/Module_vcl.mk -#sed -i -e /CppunitTest_sd_layout_tests/d sd/Module_sd.mk -#sed -i -e /CppunitTest_sc_subsequent_export_test2/d sc/Module_sc.mk -#sed -i -e /CppunitTest_sw_ooxmlexport14/d sw/Module_sw.mk -#sed -i -e /CppunitTest_sc_subsequent_filters_test2/d sc/Module_sc.mk -#sed -i -e /CppunitTest_sd_export_tests-ooxml3/d sd/Module_sd.mk -#sed -i -e /CppunitTest_sc_vba_macro_test/d sc/Module_sc.mk -#sed -i -e /CppunitTest_sw_globalfilter/d sw/Module_sw.mk -#sed -i -e /CppunitTest_sc_uicalc/d sc/Module_sc.mk -#sed -i -e /CppunitTest_sw_ooxmlexport11/d sw/Module_sw.mk -#sed -i -e /CppunitTest_sw_ooxmlexport12/d sw/Module_sw.mk -#sed -i -e /CppunitTest_sw_ooxmlexport13/d sw/Module_sw.mk -#sed -i -e /CppunitTest_sw_ooxmlexport16/d sw/Module_sw.mk -# git rm vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff @@ -981,8 +965,9 @@ rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/Lin export PRODUCTVERSIONSHORT PRODUCTVERSION # installation -export LC_ALL=C + install -m 0755 -d %{buildroot}%{instdir} +export LC_ALL=C if ! make instsetoo_native PKGFORMAT=installed DISABLE_STRIP=1 EPM=not-used-but-must-be-set; then echo - ---dump log start--- cat $WORKDIR/installation/LibreOffice/installed/logging/en-US/log_*_en-US.log @@ -2002,5 +1987,5 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Wed Sep 06 2023 Darssin <2020303249@mail.nwpu.edu.cn> - 1:7.5.2.2-1 +* Wed Sep 06 2023 Darssin <2020303249@mail.nwpu.edu.cn> - 1:7.5.5.2-1 - Package init |