Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2018-04-17 11:13:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Tue Apr 17 11:13:43 2018 rev:154 rq:597068 version:6.0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2018-04-07 20:48:18.849376636 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2018-04-17 11:13:52.240671151 +0200 @@ -1,0 +2,47 @@ +Fri Apr 13 10:49:46 UTC 2018 - [email protected] + +- Provide and obsolete all the gtk3 disabled stuff if we disable + gtk3 to ease migration + +------------------------------------------------------------------- +Thu Apr 12 07:57:17 UTC 2018 - [email protected] + +- Drop patch libreoffice-lto-failtest.patch as the problem was with + memcpy in wrong phases, fixed by cflag -flifetime-dse=1 + +------------------------------------------------------------------- +Wed Apr 11 07:47:35 UTC 2018 - [email protected] + +- Provide and obsolete also libreoffice-branding-SLE + +------------------------------------------------------------------- +Wed Apr 11 06:01:49 UTC 2018 - [email protected] + +- Use pkgconfig(libpg) instead of posgresql-devel dependency + +------------------------------------------------------------------- +Tue Apr 10 11:27:05 UTC 2018 - [email protected] + +- Bring back offline help per popular demand as lto saves space + we could use with it bsc#915996 +- Update patch to not call python directly during help generating: + * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch + +------------------------------------------------------------------- +Tue Apr 10 11:00:15 UTC 2018 - [email protected] + +- Use gpg keys to verify downloaded archives + +------------------------------------------------------------------- +Mon Apr 9 08:30:30 UTC 2018 - [email protected] + +- Add patch to disable test failing with LTO: + * libreoffice-lto-failtest.patch + +------------------------------------------------------------------- +Fri Apr 6 14:27:40 UTC 2018 - [email protected] + +- Switch to memory-constraints macros to limit threads as needed +- Enable LTO on libreoffice, 16% smaller binaries, less memory used + +------------------------------------------------------------------- @@ -81,0 +129 @@ + * fixes bsc#1089706 CVE-2018-10120 @@ -132,0 +181 @@ + * Also fixes bsc#1089705 CVE-2018-10119 New: ---- libreoffice-6.0.3.2.tar.xz.asc libreoffice-help-6.0.3.2.tar.xz.asc libreoffice-translations-6.0.3.2.tar.xz.asc libreoffice.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.WB1cYt/_old 2018-04-17 11:13:59.056351511 +0200 +++ /var/tmp/diff_new_pack.WB1cYt/_new 2018-04-17 11:13:59.060351323 +0200 @@ -55,10 +55,14 @@ Group: Productivity/Office/Suite URL: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz -Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz -Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz +Source1: %{tarball_url}/libreoffice-%{version}.tar.xz.asc +Source2: %{tarball_url}/libreoffice-help-%{version}.tar.xz +Source3: %{tarball_url}/libreoffice-help-%{version}.tar.xz.asc +Source4: %{tarball_url}/libreoffice-translations-%{version}.tar.xz +Source5: %{tarball_url}/libreoffice-translations-%{version}.tar.xz.asc # SUSE color palette bsc#1045339 https://intra.microfocus.net/brandcentral/suse/identity.php#palette -Source3: SUSE.soc +Source6: SUSE.soc +Source98: %{name}.keyring Source99: %{name}-rpmlintrc # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt @@ -140,12 +144,12 @@ BuildRequires: libtool BuildRequires: lpsolve-devel BuildRequires: make +BuildRequires: memory-constraints BuildRequires: neon-devel >= 0.26.0 BuildRequires: openldap2-devel BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine BuildRequires: pkgconfig -BuildRequires: postgresql-devel BuildRequires: python3-xml BuildRequires: sac BuildRequires: ucpp @@ -190,6 +194,7 @@ BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 BuildRequires: pkgconfig(liborcus-0.13) BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) @@ -245,6 +250,13 @@ %if %{with gtk3} BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) +%else +Provides: libreofficekit = %{version} +Obsoletes: libreofficekit < %{version} +Provides: libreofficekit-devel = %{version} +Obsoletes: libreofficekit-devel < %{version} +Provides: %{name}-gtk3 = %{version} +Obsoletes: %{name}-gtk3 < %{version} %endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel @@ -302,11 +314,13 @@ %package branding-upstream Summary: Original Branding for LibreOffice Group: Productivity/Office/Suite -Supplements: packageand(libreoffice:branding-upstream) +Supplements: libreoffice Conflicts: libreoffice-branding Provides: libreoffice-branding = %{version} Provides: libreoffice-branding-openSUSE = 4.0.1 Obsoletes: libreoffice-branding-openSUSE < 4.0.1 +Provides: libreoffice-branding-SLE = 4.0.1 +Obsoletes: libreoffice-branding-SLE < 4.0.1 BuildArch: noarch %description branding-upstream @@ -521,7 +535,7 @@ This package contains Gtk2 interface rendering option for LibreOffice. %package kde4 -Summary: kde4 interface for LibreOffice +Summary: KDE4 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} # we need full kdelibs4 otherwise we will crash @@ -740,12 +754,13 @@ # S:s: script classification (cjk, ctl). -S is only a marker, as it does # not add any .xcd into the package (the file does not exist for at # least one CTL-using locale, si) +# T has help files # Xx: has autotext definitions # # Example: # libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ: # %%langpack -l cs -n Czech -m cs_CZ -%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:Xx:) \ +%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:TXx:) \ %define project LibreOffice \ %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ @@ -789,6 +804,10 @@ Provides additional %{langname} translations and resources for %{project}. \ \ %files %{pkgname} \ +%{-T: \ +%dir %{_datadir}/libreoffice/help/%{_langpack_lang} \ +%{_datadir}/libreoffice/help/%{_langpack_lang} \ +}\ %{!-E: \ %define autotextdir %{_datadir}/%{name}/share/autotext \ %dir %{autotextdir} \ @@ -802,77 +821,77 @@ %{expand:%%_link_noarch_files %{pkgname}} \ %{nil} %langpack -l af -n Afrikaans -m af_ZA -%langpack -l ar -n Arabic -s ctl -m ar +%langpack -l ar -n Arabic -s ctl -m ar -T %langpack -l as -n Assamese -%langpack -l bg -n Bulgarian -X -m bg_BG -%langpack -l bn -n Bengali -m bn_BD +%langpack -l bg -n Bulgarian -X -m bg_BG -T +%langpack -l bn -n Bengali -m bn_BD -T %langpack -l br -n Breton -m br_FR -%langpack -l ca -n Catalan -M -X -%langpack -l cs -n Czech -X -m cs_CZ +%langpack -l ca -n Catalan -M -X -T +%langpack -l cs -n Czech -X -m cs_CZ -T %langpack -l cy -n Welsh -%langpack -l da -n Danish -X -m da_DK -%langpack -l de -n German -X -M -%langpack -l dz -n Dzongkha -s ctl -%langpack -l el -n Greek -m el_GR -%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US -%langpack -l eo -n Esperanto -%langpack -l es -n Spanish -M -X -%langpack -l et -n Estonian -m et_EE -%langpack -l eu -n Basque +%langpack -l da -n Danish -X -m da_DK -T +%langpack -l de -n German -X -M -T +%langpack -l dz -n Dzongkha -s ctl -T +%langpack -l el -n Greek -m el_GR -T +%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US -T +%langpack -l eo -n Esperanto -T +%langpack -l es -n Spanish -M -X -T +%langpack -l et -n Estonian -m et_EE -T +%langpack -l eu -n Basque -T %langpack -l fa -n Farsi -s ctl -X -%langpack -l fi -n Finnish -r libreoffice-voikko -X -%langpack -l fr -n French -X -m fr_FR +%langpack -l fi -n Finnish -r libreoffice-voikko -X -T +%langpack -l fr -n French -X -m fr_FR -T %langpack -l ga -n Irish -%langpack -l gl -n Galician -M -%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -%langpack -l he -n Hebrew -s ctl -m he_IL -%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -%langpack -l hr -n Croatian -m hr_HR -X -%langpack -l hu -n Hungarian -X -m hu_HU -%langpack -l it -n Italian -X -m it_IT -%langpack -l ja -n Japanese -s cjk -X +%langpack -l gl -n Galician -M -T +%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T +%langpack -l he -n Hebrew -s ctl -m he_IL -T +%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T +%langpack -l hr -n Croatian -m hr_HR -X -T +%langpack -l hu -n Hungarian -X -m hu_HU -T +%langpack -l it -n Italian -X -m it_IT -T +%langpack -l ja -n Japanese -s cjk -X -T %langpack -l kk -n Kazakh %langpack -l kn -n Kannada -%langpack -l ko -n Korean -s cjk -X -%langpack -l lt -n Lithuanian -m lt_LT -X -%langpack -l lv -n Latvian -m lv_LV +%langpack -l ko -n Korean -s cjk -X -T +%langpack -l lt -n Lithuanian -m lt_LT -X -T +%langpack -l lv -n Latvian -m lv_LV -T %langpack -l mai -n Maithili %langpack -l ml -n Malayalam %langpack -l mr -n Marathi -%langpack -l nb -n Bokmal -M -m no -%langpack -l nl -n Dutch -X -m nl_NL -%langpack -l nn -n Nynorsk -m no +%langpack -l nb -n Bokmal -M -m no -T +%langpack -l nl -n Dutch -X -m nl_NL -T +%langpack -l nn -n Nynorsk -m no -T %langpack -l nr -n Southern_Ndebele %langpack -l nso -n Northern_Sotho %langpack -l or -n Odia -s ctl %langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN -%langpack -l pl -n Polish -X -m pl_PL -%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR -%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -%langpack -l ro -n Romanian -M -X -%langpack -l ru -n Russian -X -m ru_RU -%langpack -l si -n Sinhalese -S ctl -m si_LK -%langpack -l sk -n Slovak -X -m sk_SK -%langpack -l sl -n Slovenian -X -m sl_SI +%langpack -l pl -n Polish -X -m pl_PL -T +%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR -T +%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -T +%langpack -l ro -n Romanian -M -X -T +%langpack -l ru -n Russian -X -m ru_RU -T +%langpack -l si -n Sinhalese -S ctl -m si_LK -T +%langpack -l sk -n Slovak -X -m sk_SK -T +%langpack -l sl -n Slovenian -X -m sl_SI -T %langpack -l sr -n Serbian -i sr-Latn -M -j sr_Latn -g sr -k sr@latin %langpack -l ss -n Swati %langpack -l st -n Southern_Sotho -%langpack -l sv -n Swedish -X -m sv_SE -%langpack -l ta -n Tamil -s ctl +%langpack -l sv -n Swedish -X -m sv_SE -T +%langpack -l ta -n Tamil -s ctl -T %langpack -l te -n Telugu -m te_IN %langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH %langpack -l tn -n Tswana -%langpack -l tr -n Turkish -X +%langpack -l tr -n Turkish -X -T %langpack -l ts -n Tsonga -%langpack -l uk -n Ukrainian -m uk_UA +%langpack -l uk -n Ukrainian -m uk_UA -T %langpack -l ve -n Venda %langpack -l xh -n Xhosa -%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN -%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW +%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN -T +%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW -T %langpack -l zu -n Zulu -m zu_ZA %prep -%setup -q -b1 -b2 +%setup -q -b2 -b4 %if 0%{?suse_version} < 1330 # The rename of the configdir is needed only on older than factory for compat %patch1 @@ -904,39 +923,15 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile %build -# Parallel build settings ... -lo_jobs="%{?jobs:%{jobs}}" -%ifarch %{arm} - %if ! 0%{?qemu_user_space_build:1} - # native hardware is not that powerful - lo_jobs="1" - %endif -%endif # do not eat all memory -echo "Available memory:" -cat /proc/meminfo -echo "System limits:" -ulimit -a -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - mem_per_process=1200000 - max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-parallelism=$lo_jobs" -fi +%limit_build -m 1200 # make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... # remove big debugsymbols as we simply consume too much space -ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" -CFLAGS="$ARCH_FLAGS" -CXXFLAGS="$ARCH_FLAGS" +ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" +CFLAGS="$ARCH_FLAGS -flifetime-dse=1" +CXXFLAGS="$ARCH_FLAGS -flifetime-dse=1" export ARCH_FLAGS CFLAGS CXXFLAGS # Colada does not have .pc file and configure creator was really lazy @@ -954,8 +949,9 @@ export NOCONFIGURE=yes ./autogen.sh %configure \ - $PARALLEL_BUILD \ + --with-parallelism=%{jobs} \ --enable-eot \ + --enable-lto \ --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ @@ -998,8 +994,7 @@ --with-external-dict-dir=%{_datadir}/hunspell \ --with-external-hyph-dir=%{_datadir}/hyphen \ --with-external-thes-dir=%{_datadir}/mythes \ - --without-helppack-integration \ - --without-help \ + --with-help \ --without-export-validation \ --enable-odk \ %if %{with kdeintegration} @@ -1227,7 +1222,7 @@ rm pyfiles.txt # Install color palette -cp %{SOURCE3} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc +cp %{SOURCE6} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt %if %{with gtk3} @@ -1447,6 +1442,7 @@ %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip %{_datadir}/%{name}/share/config/images_tango.zip +%{_datadir}/%{name}/share/config/images_helpimg.zip %files -f file-lists/branding_upstream.txt branding-upstream ++++++ 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch ++++++ --- /var/tmp/diff_new_pack.WB1cYt/_old 2018-04-17 11:13:59.088350010 +0200 +++ /var/tmp/diff_new_pack.WB1cYt/_new 2018-04-17 11:13:59.088350010 +0200 @@ -38,3 +38,40 @@ -- 2.16.1 +From 76635096e9c9832d856e8eb1798ce70256f6d81b Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <[email protected]> +Date: Fri, 23 Feb 2018 08:43:00 +0100 +Subject: Adapt CustomTarget_helpcontent2/source/auxiliary + +...to core 906a2e4fa4e9ce231126c608e741c0c0d809157d "Always execute +pack_images.py with the right Python interpreter" + +Change-Id: I7c6c9aed33222fb5b902e30a05cefe8f88c66df1 +--- + CustomTarget_imagelist.mk | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +(limited to 'CustomTarget_imagelist.mk') + +diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk +index f0710e6..099bebe 100644 +--- a/helpcontent2/CustomTarget_imagelist.mk ++++ b/helpcontent2/CustomTarget_imagelist.mk +@@ -19,11 +19,12 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\ + + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : \ + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \ +- $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst ++ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst \ ++ | $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Helper_abbreviate_dirs, \ + ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ +- $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \ ++ $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \ + -g $(helpmedia_DIR) -m $(helpmedia_DIR) -c $(helpmedia_DIR) \ + -l $${ILSTFILE} \ + -s $< -o $@ \ +-- +cgit v1.1 +
