From cda0c4b4d8a99f1eb0d93cca66e615ee0e53a4f5 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 04:24:07 +0300 Subject: [PATCH] bot: rpm5 -> rpm4 (1) --- libreoffice.spec | 106 +++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 755834b..75152db 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -33,8 +33,8 @@ %define ccachedir ~/.ccache-OOo %if %{_use_internal_dependency_generator} -%define __noautoreq 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' -%define __noautoprov libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 +%global __requires_exclude 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' +%global __provides_exclude libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 %else %define _requires_exceptions libjawt.so\\|libmyspell.so\\|libstlport_gcc.so\\|libmono.so\\|mono\\|devel(libunoidl)\\|devel(libunoidl(64bit)) %define _provides_exceptions libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 @@ -267,7 +267,7 @@ BuildRequires: ant-apache-regexp BuildRequires: junit BuildRequires: java-1.8.0-openjdk-devel %endif -Suggests: %{name}-java = %{EVRD} +Recommends: %{name}-java = %{EVRD} # STLport-devel 4.5 + private patches are needed BuildConflicts: STLport-devel # Requres to all our packages @@ -352,7 +352,7 @@ Group: Office Requires: %{name}-style = %{EVRD} # And breeze too, it should be default for Plasma 5 Requires: %{name}-style-breeze = %{EVRD} -Suggests: %{name}-help-en_US = %{EVRD} +Recommends: %{name}-help-en_US = %{EVRD} # And then general requires for OOo follows Requires: ghostscript Requires: fonts-ttf-liberation @@ -420,9 +420,9 @@ Obsoletes: %{name}-style-galaxy < %{EVRD} Obsoletes: %{name}-style-oxygen < %{EVRD} Conflicts: %{name}-style-galaxy < %{EVRD} Conflicts: %{name}-style-oxygen < %{EVRD} -Suggests: noto-sans-fonts -Suggests: noto-sans-mono-fonts -Suggests: noto-serif-fonts +Recommends: noto-sans-fonts +Recommends: noto-sans-mono-fonts +Recommends: noto-serif-fonts %description common This package contains the application-independent files of LibreOffice. @@ -534,7 +534,7 @@ This package contains the GNOME VFS support and a GConf backend. Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} -Suggests: %{name}-style-breeze = %{EVRD} +Recommends: %{name}-style-breeze = %{EVRD} %description gtk3-kde5 This package contains the VCL plugin to draw interface with GTK+3 @@ -550,7 +550,7 @@ but use KDE5 file picker. Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} -Suggests: %{name}-style-breeze = %{EVRD} +Recommends: %{name}-style-breeze = %{EVRD} %description kde5 This package contains the KDE5 plugin for drawing LibreOffice widgets with @@ -717,7 +717,7 @@ This package contains the "tango" symbol style, default style for GTK/Gnome. Summary: LibreOffice office suite - word processor Group: Office Requires: %{name}-common = %{EVRD} -Suggests: libreoffice-pagination +Recommends: libreoffice-pagination %description writer This package contains the word processor component for LibreOffice. @@ -910,7 +910,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-bg Provides: LibreOffice-l10n-bg = %{EVRD} -Suggests: %{ooname}-help-bg = %{EVRD} +Recommends: %{ooname}-help-bg = %{EVRD} %description l10n-bg This package contains the localization of LibreOffice in Bulgarian. @@ -930,7 +930,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-bn Provides: LibreOffice-l10n-bn = %{EVRD} -Suggests: %{ooname}-help-bn = %{EVRD} +Recommends: %{ooname}-help-bn = %{EVRD} %description l10n-bn This package contains the localization of LibreOffice in Bengali. @@ -969,7 +969,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-bs Provides: LibreOffice-l10n-bs = %{EVRD} -Suggests: %{ooname}-help-bs = %{EVRD} +Recommends: %{ooname}-help-bs = %{EVRD} %description l10n-bs This package contains the localization of LibreOffice in Bosnian. @@ -991,7 +991,7 @@ Requires: locales-ca Requires: urw-fonts Requires: myspell-ca Provides: LibreOffice-l10n-ca = %{EVRD} -Suggests: %{ooname}-help-ca = %{EVRD} +Recommends: %{ooname}-help-ca = %{EVRD} %description l10n-ca This package contains the localization of LibreOffice in Catalan. @@ -1014,7 +1014,7 @@ Requires: urw-fonts Requires: myspell-cs Requires: myspell-hyph-cs Provides: LibreOffice-l10n-cs = %{EVRD} -Suggests: %{ooname}-help-cs = %{EVRD} +Recommends: %{ooname}-help-cs = %{EVRD} %description l10n-cs This package contains the localization of LibreOffice in Czech. @@ -1058,7 +1058,7 @@ Requires: fonts-ttf-dejavu Requires: urw-fonts Requires: myspell-da, myspell-hyph-da Provides: LibreOffice-l10n-da = %{EVRD} -Suggests: %{ooname}-help-da = %{EVRD} +Recommends: %{ooname}-help-da = %{EVRD} %description l10n-da This package contains the localization of LibreOffice in Danish. @@ -1082,7 +1082,7 @@ Requires: urw-fonts Requires: myspell-de Requires: myspell-hyph-de Provides: LibreOffice-l10n-de = %{EVRD} -Suggests: %{ooname}-help-de = %{EVRD} +Recommends: %{ooname}-help-de = %{EVRD} %description l10n-de This package contains the localization of LibreOffice in German. @@ -1102,7 +1102,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-dz Provides: LibreOffice-l10n-dz = %{EVRD} -Suggests: %{ooname}-help-dz = %{EVRD} +Recommends: %{ooname}-help-dz = %{EVRD} %description l10n-dz This package contains the localization of LibreOffice in Dzongkha. @@ -1125,7 +1125,7 @@ Requires: fonts-type1-greek Requires: myspell-el Requires: myspell-hyph-el Provides: LibreOffice-l10n-el = %{EVRD} -Suggests: %{ooname}-help-el = %{EVRD} +Recommends: %{ooname}-help-el = %{EVRD} %description l10n-el This package contains the localization of LibreOffice in Greek. @@ -1148,7 +1148,7 @@ Requires: urw-fonts Requires: myspell-en_GB Requires: myspell-hyph-en Provides: LibreOffice-l10n-en_GB = %{EVRD} -Suggests: %{ooname}-help-en_GB = %{EVRD} +Recommends: %{ooname}-help-en_GB = %{EVRD} %description l10n-en_GB This package contains the localization of LibreOffice in British. @@ -1172,7 +1172,7 @@ Requires: urw-fonts Requires: myspell-es Requires: myspell-hyph-es Provides: LibreOffice-l10n-es = %{EVRD} -Suggests: %{ooname}-help-es = %{EVRD} +Recommends: %{ooname}-help-es = %{EVRD} %description l10n-es This package contains the localization of LibreOffice in Spanish. @@ -1196,7 +1196,7 @@ Requires: urw-fonts Requires: myspell-et Requires: myspell-hyph-et Provides: LibreOffice-l10n-et = %{EVRD} -Suggests: %{ooname}-help-et = %{EVRD} +Recommends: %{ooname}-help-et = %{EVRD} %description l10n-et This package contains the localization of LibreOffice in Estonian. @@ -1218,7 +1218,7 @@ Requires: locales-eu Requires: fonts-ttf-dejavu Requires: urw-fonts Provides: LibreOffice-l10n-eu = %{EVRD} -Suggests: %{ooname}-help-eu = %{EVRD} +Recommends: %{ooname}-help-eu = %{EVRD} %description l10n-eu This package contains the localization of LibreOffice in Basque. @@ -1259,7 +1259,7 @@ Requires: locales-fi Requires: fonts-ttf-dejavu Requires: urw-fonts Provides: LibreOffice-l10n-fi = %{EVRD} -Suggests: %{ooname}-help-fi = %{EVRD} +Recommends: %{ooname}-help-fi = %{EVRD} %description l10n-fi This package contains the localization of LibreOffice in Finnish. @@ -1283,7 +1283,7 @@ Requires: urw-fonts Requires: myspell-fr Requires: myspell-hyph-fr Provides: LibreOffice-l10n-fr = %{EVRD} -Suggests: %{ooname}-help-fr = %{EVRD} +Recommends: %{ooname}-help-fr = %{EVRD} %description l10n-fr This package contains the localization of LibreOffice in French. @@ -1322,7 +1322,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-gl Provides: LibreOffice-l10n-gl = %{EVRD} -Suggests: %{ooname}-help-gl = %{EVRD} +Recommends: %{ooname}-help-gl = %{EVRD} %description l10n-gl This package contains the localization of LibreOffice in Galician. @@ -1342,7 +1342,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-gu Provides: LibreOffice-l10n-gu = %{EVRD} -Suggests: %{ooname}-help-gu = %{EVRD} +Recommends: %{ooname}-help-gu = %{EVRD} %description l10n-gu This package contains the localization of LibreOffice in Gujarati. @@ -1363,7 +1363,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-he Requires: urw-fonts Provides: LibreOffice-l10n-he = %{EVRD} -Suggests: %{ooname}-help-he = %{EVRD} +Recommends: %{ooname}-help-he = %{EVRD} %description l10n-he This package contains the localization of LibreOffice in Hebrew. @@ -1384,7 +1384,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-hi Requires: urw-fonts Provides: LibreOffice-l10n-hi = %{EVRD} -Suggests: %{ooname}-help-hi = %{EVRD} +Recommends: %{ooname}-help-hi = %{EVRD} %description l10n-hi This package contains the localization of LibreOffice in Hindi. @@ -1404,7 +1404,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-hr Provides: LibreOffice-l10n-hr = %{EVRD} -Suggests: %{ooname}-help-hr = %{EVRD} +Recommends: %{ooname}-help-hr = %{EVRD} %description l10n-hr This package contains the localization of LibreOffice in Croatian. @@ -1427,7 +1427,7 @@ Requires: urw-fonts Requires: myspell-hu Requires: myspell-hyph-hu Provides: LibreOffice-l10n-hu = %{EVRD} -Suggests: %{ooname}-help-hu = %{EVRD} +Recommends: %{ooname}-help-hu = %{EVRD} %description l10n-hu This package contains the localization of LibreOffice in Hungarian. @@ -1450,7 +1450,7 @@ Requires: urw-fonts Requires: myspell-it Requires: myspell-hyph-it Provides: LibreOffice-l10n-it = %{EVRD} -Suggests: %{ooname}-help-it = %{EVRD} +Recommends: %{ooname}-help-it = %{EVRD} %description l10n-it This package contains the localization of LibreOffice in Italian. @@ -1471,7 +1471,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-ja Requires: fonts-ttf-japanese Provides: LibreOffice-l10n-ja = %{EVRD} -Suggests: %{ooname}-help-ja = %{EVRD} +Recommends: %{ooname}-help-ja = %{EVRD} %description l10n-ja This package contains the localization of LibreOffice in Japanese. @@ -1511,7 +1511,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-ko Requires: fonts-ttf-korean >= 1.0.2 Provides: LibreOffice-l10n-ko = %{EVRD} -Suggests: %{ooname}-help-ko = %{EVRD} +Recommends: %{ooname}-help-ko = %{EVRD} %description l10n-ko This package contains the localization of LibreOffice in Korean. @@ -1607,7 +1607,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-mk Provides: LibreOffice-l10n-mk = %{EVRD} -Suggests: %{ooname}-help-mk = %{EVRD} +Recommends: %{ooname}-help-mk = %{EVRD} %description l10n-mk This package contains the localization of LibreOffice in Macedonian. @@ -1647,7 +1647,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-no Requires: urw-fonts Provides: LibreOffice-l10n-nb = %{EVRD} -Suggests: %{ooname}-help-nb = %{EVRD} +Recommends: %{ooname}-help-nb = %{EVRD} %description l10n-nb This package contains the localization of LibreOffice in Norwegian Bokmal. @@ -1671,7 +1671,7 @@ Requires: urw-fonts Requires: myspell-nl Requires: myspell-hyph-nl Provides: LibreOffice-l10n-nl = %{EVRD} -Suggests: %{ooname}-help-nl = %{EVRD} +Recommends: %{ooname}-help-nl = %{EVRD} %description l10n-nl This package contains the localization of LibreOffice in Dutch. @@ -1692,7 +1692,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-no Requires: urw-fonts Provides: LibreOffice-l10n-nn = %{EVRD} -Suggests: %{ooname}-help-nn = %{EVRD} +Recommends: %{ooname}-help-nn = %{EVRD} %description l10n-nn This package contains the localization of LibreOffice in Norwegian Nynorsk. @@ -1792,7 +1792,7 @@ Requires: urw-fonts Requires: myspell-pl Requires: myspell-hyph-pl Provides: LibreOffice-l10n-pl = %{EVRD} -Suggests: %{ooname}-help-pl = %{EVRD} +Recommends: %{ooname}-help-pl = %{EVRD} %description l10n-pl This package contains the localization of LibreOffice in Polish. @@ -1816,7 +1816,7 @@ Requires: urw-fonts Requires: myspell-pt Requires: myspell-hyph-pt Provides: LibreOffice-l10n-pt = %{EVRD} -Suggests: %{ooname}-help-pt = %{EVRD} +Recommends: %{ooname}-help-pt = %{EVRD} %description l10n-pt This package contains the localization of LibreOffice in Portuguese. @@ -1837,7 +1837,7 @@ Requires: locales-pt Requires: urw-fonts Requires: myspell-pt_BR Provides: LibreOffice-l10n_pt_BR = %{EVRD} -Suggests: %{ooname}-help-pt_BR = %{EVRD} +Recommends: %{ooname}-help-pt_BR = %{EVRD} %description l10n-pt_BR This package contains the localization of LibreOffice in Portuguese @@ -1876,12 +1876,12 @@ Group: Office Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-ru -Suggests: fonts-ttf-paratype +Recommends: fonts-ttf-paratype Requires: urw-fonts Requires: myspell-ru Requires: myspell-hyph-ru Provides: LibreOffice-l10n-ru = %{EVRD} -Suggests: %{ooname}-help-ru = %{EVRD} +Recommends: %{ooname}-help-ru = %{EVRD} %description l10n-ru This package contains the localization of LibreOffice in Russian. @@ -1920,7 +1920,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-si Provides: LibreOffice-l10n-si = %{EVRD} -Suggests: %{ooname}-help-si = %{EVRD} +Recommends: %{ooname}-help-si = %{EVRD} %description l10n-si This package contains the localization of LibreOffice in Sinhalese. @@ -1943,7 +1943,7 @@ Requires: urw-fonts Requires: myspell-sk Requires: myspell-hyph-sk Provides: LibreOffice-l10n-sk = %{EVRD} -Suggests: %{ooname}-help-sk = %{EVRD} +Recommends: %{ooname}-help-sk = %{EVRD} %description l10n-sk This package contains the localization of LibreOffice in Slovak. @@ -1965,7 +1965,7 @@ Requires: locales-sl Requires: urw-fonts Requires: myspell-sl, myspell-hyph-sl Provides: LibreOffice-l10n-sl = %{EVRD} -Suggests: %{ooname}-help-sl = %{EVRD} +Recommends: %{ooname}-help-sl = %{EVRD} %description l10n-sl This package contains the localization of LibreOffice in Slovenian. @@ -2046,7 +2046,7 @@ Requires: urw-fonts Requires: myspell-sv Requires: myspell-hyph-sv Provides: LibreOffice-l10n-sv = %{EVRD} -Suggests: %{ooname}-help-sv = %{EVRD} +Recommends: %{ooname}-help-sv = %{EVRD} %description l10n-sv This package contains the localization of LibreOffice in Swedish. @@ -2144,7 +2144,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-tr Requires: urw-fonts Provides: LibreOffice-l10n-tr = %{EVRD} -Suggests: %{ooname}-help-tr = %{EVRD} +Recommends: %{ooname}-help-tr = %{EVRD} %description l10n-tr This package contains the localization of LibreOffice in Turkish. @@ -2183,7 +2183,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-uk Provides: LibreOffice-l10n-uk = %{EVRD} -Suggests: %{ooname}-help-uk = %{EVRD} +Recommends: %{ooname}-help-uk = %{EVRD} %description l10n-uk This package contains the localization of LibreOffice in Ukrainian. @@ -2242,7 +2242,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-zh Requires: fonts-ttf-chinese Provides: LibreOffice-l10n-zh_CN = %{EVRD} -Suggests: %{ooname}-help-zh_CN = %{EVRD} +Recommends: %{ooname}-help-zh_CN = %{EVRD} %description l10n-zh_CN This package contains the localization of LibreOffice in Chinese Simplified. @@ -2263,7 +2263,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-zh Requires: fonts-ttf-chinese Provides: LibreOffice-l10n-zh_TW = %{EVRD} -Suggests: %{ooname}-help-zh_TW = %{EVRD} +Recommends: %{ooname}-help-zh_TW = %{EVRD} %description l10n-zh_TW This package contains the localization of LibreOffice in Chinese @@ -3004,7 +3004,7 @@ sed -i \ configure %endif -%configure2_5x \ +%configure \ %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ @@ -3110,7 +3110,7 @@ touch external/tarballs/.downloaded # We use make build here because the default target is "allandcheck". # Checking should go to check -%make -r -s V=0 \ +%make_build -r -s V=0 \ ARCH_FLAGS="$ARCH_FLAGS" \ ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \ ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \