- modernize macros usage

diff --git a/libreoffice.spec b/libreoffice.spec
index 0e8535de2038881c6b83234cc9f92e43e860450c..9add05930a17061702fc77c349083dfe51094d2e 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -219,7 +219,7 @@ BuildRequires:      python3-lxml
 BuildRequires: python3-modules >= 1:3.3
 BuildRequires: redland-devel >= 1.0.16
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.660
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sablotron-devel
 BuildRequires: sane-backends-devel
 BuildRequires: saxon
@@ -490,9 +490,7 @@ Requires:   java-commons-codec
 Requires:      java-commons-httpclient
 Requires:      java-commons-lang
 Requires:      java-commons-logging
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description wiki-publisher
 The Wiki Publisher enables you to create Wiki articles on MediaWiki
@@ -677,9 +675,7 @@ Group:              X11/Applications
 Requires:      %{name}-calc = %{version}-%{release}
 Requires:      %{name}-core = %{version}-%{release}
 Requires:      %{name}-ure = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description nlpsolver
 A non-linear solver engine for Calc as an alternative to the default
@@ -730,9 +726,7 @@ Obsoletes:  openoffice-i18n-af-gtk
 Obsoletes:     openoffice.org-i18n-af
 Obsoletes:     openoffice.org-i18n-af-gtk
 Obsoletes:     openoffice.org-i18n-af-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-af
 This package provides resources containing menus and dialogs in
@@ -747,9 +741,7 @@ Summary:    LibreOffice - interface in Amharic language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku amharskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-am
 This package provides resources containing menus and dialogs in
@@ -769,9 +761,7 @@ Obsoletes:  openoffice-i18n-ar-gtk
 Obsoletes:     openoffice.org-i18n-ar
 Obsoletes:     openoffice.org-i18n-ar-gtk
 Obsoletes:     openoffice.org-i18n-ar-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ar
 This package provides resources containing menus and dialogs in Arabic
@@ -787,9 +777,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku asamskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-as_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-as
 This package provides resources containing menus and dialogs in
@@ -805,9 +793,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku asturyjskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ast
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ast
 This package provides resources containing menus and dialogs in
@@ -823,9 +809,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku białoruskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-be_BY
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-be_BY
 This package provides resources containing menus and dialogs in
@@ -845,9 +829,7 @@ Obsoletes:  openoffice-i18n-bg-gtk
 Obsoletes:     openoffice.org-i18n-bg
 Obsoletes:     openoffice.org-i18n-bg-gtk
 Obsoletes:     openoffice.org-i18n-bg-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-bg
 This package provides resources containing menus and dialogs in
@@ -863,9 +845,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku indyjskim bengalskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-bn_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-bn_IN
 This package provides resources containing menus and dialogs in Indian
@@ -881,9 +861,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku bengalskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-bn
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-bn
 This package provides resources containing menus and dialogs in Bangla
@@ -899,9 +877,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku tybetańskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-bo
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-bo
 This package provides resources containing menus and dialogs in
@@ -917,9 +893,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku bretońskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-br
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-br
 This package provides resources containing menus and dialogs in Breton
@@ -935,9 +909,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku boro
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-brx
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-brx
 This package provides resources containing menus and dialogs in Bodo
@@ -953,9 +925,7 @@ Summary(pl.UTF-8):  LibreOffice - interfejs w języku bośniackim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-bs
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-bs
 This package provides resources containing menus and dialogs in
@@ -975,9 +945,7 @@ Obsoletes:  openoffice-i18n-ca-gtk
 Obsoletes:     openoffice.org-i18n-ca
 Obsoletes:     openoffice.org-i18n-ca-gtk
 Obsoletes:     openoffice.org-i18n-ca-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ca
 This package provides resources containing menus and dialogs in
@@ -992,9 +960,7 @@ Summary:    LibreOffice - interface in Catalan Valencian language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku katalońskim walenckim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ca_XV
 This package provides resources containing menus and dialogs in
@@ -1014,9 +980,7 @@ Obsoletes: openoffice-i18n-cs-gtk
 Obsoletes:     openoffice.org-i18n-cs
 Obsoletes:     openoffice.org-i18n-cs-gtk
 Obsoletes:     openoffice.org-i18n-cs-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-cs
 This package provides resources containing menus and dialogs in Czech
@@ -1036,9 +1000,7 @@ Obsoletes:        openoffice-i18n-cy-gtk
 Obsoletes:     openoffice.org-i18n-cy
 Obsoletes:     openoffice.org-i18n-cy-gtk
 Obsoletes:     openoffice.org-i18n-cy-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-cy
 This package provides resources containing menus and dialogs in
@@ -1058,9 +1020,7 @@ Obsoletes:        openoffice-i18n-da-gtk
 Obsoletes:     openoffice.org-i18n-da
 Obsoletes:     openoffice.org-i18n-da-gtk
 Obsoletes:     openoffice.org-i18n-da-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-da
 This package provides resources containing menus and dialogs in Danish
@@ -1080,9 +1040,7 @@ Obsoletes:        openoffice-i18n-de-gtk
 Obsoletes:     openoffice.org-i18n-de
 Obsoletes:     openoffice.org-i18n-de-gtk
 Obsoletes:     openoffice.org-i18n-de-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-de
 This package provides resources containing menus and dialogs in German
@@ -1098,9 +1056,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku dogri
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-dgo
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-dgo
 This package provides resources containing menus and dialogs in Dogri
@@ -1116,9 +1072,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku dolnołużyckim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-dsb
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-dsb
 This package provides resources containing menus and dialogs in
@@ -1134,9 +1088,7 @@ Summary(pl.UTF-8):        Openoffice.org - interfejs w języku dżongkha
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-dz
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-dz
 This package provides resources containing menus and dialogs in
@@ -1156,9 +1108,7 @@ Obsoletes:        openoffice-i18n-el-gtk
 Obsoletes:     openoffice.org-i18n-el
 Obsoletes:     openoffice.org-i18n-el-gtk
 Obsoletes:     openoffice.org-i18n-el-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-el
 This package provides resources containing menus and dialogs in Greek
@@ -1174,9 +1124,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku anglieskim dla Wielkiej Bry
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-en_GB
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-en_GB
 This package provides resources containing menus and dialogs in
@@ -1192,9 +1140,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku anglieskim dla Południowej
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-en_ZA
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-en_ZA
 This package provides resources containing menus and dialogs in
@@ -1210,9 +1156,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku esperanto
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-eo
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-eo
 This package provides resources containing menus and dialogs in
@@ -1232,9 +1176,7 @@ Obsoletes:        openoffice-i18n-es-gtk
 Obsoletes:     openoffice.org-i18n-es
 Obsoletes:     openoffice.org-i18n-es-gtk
 Obsoletes:     openoffice.org-i18n-es-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-es
 This package provides resources containing menus and dialogs in
@@ -1254,9 +1196,7 @@ Obsoletes:        openoffice-i18n-et-gtk
 Obsoletes:     openoffice.org-i18n-et
 Obsoletes:     openoffice.org-i18n-et-gtk
 Obsoletes:     openoffice.org-i18n-et-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-et
 This package provides resources containing menus and dialogs in
@@ -1275,9 +1215,7 @@ Obsoletes:        openoffice-i18n-eu
 Obsoletes:     openoffice-i18n-eu-gtk
 Obsoletes:     openoffice-i18n-eu-kde
 Obsoletes:     openoffice.org-i18n-eu
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-eu
 This package provides resources containing menus and dialogs in Basque
@@ -1296,9 +1234,7 @@ Obsoletes:        openoffice-i18n-fa
 Obsoletes:     openoffice-i18n-fa-gtk
 Obsoletes:     openoffice-i18n-fa-kde
 Obsoletes:     openoffice.org-i18n-fa
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-fa
 This package provides resources containing menus and dialogs in
@@ -1318,9 +1254,7 @@ Obsoletes:        openoffice-i18n-fi-gtk
 Obsoletes:     openoffice.org-i18n-fi
 Obsoletes:     openoffice.org-i18n-fi-gtk
 Obsoletes:     openoffice.org-i18n-fi-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-fi
 This package provides resources containing menus and dialogs in
@@ -1340,9 +1274,7 @@ Obsoletes:        openoffice-i18n-fr-gtk
 Obsoletes:     openoffice.org-i18n-fr
 Obsoletes:     openoffice.org-i18n-fr-gtk
 Obsoletes:     openoffice.org-i18n-fr-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-fr
 This package provides resources containing menus and dialogs in French
@@ -1362,9 +1294,7 @@ Obsoletes:        openoffice-i18n-fy-gtk
 Obsoletes:     openoffice.org-i18n-fy
 Obsoletes:     openoffice.org-i18n-fy-gtk
 Obsoletes:     openoffice.org-i18n-fy-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-fy
 This package provides resources containing menus and dialogs in
@@ -1384,9 +1314,7 @@ Obsoletes:        openoffice-i18n-ga-gtk
 Obsoletes:     openoffice.org-i18n-ga
 Obsoletes:     openoffice.org-i18n-ga-gtk
 Obsoletes:     openoffice.org-i18n-ga-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ga
 This package provides resources containing menus and dialogs in Irish
@@ -1401,9 +1329,7 @@ Summary:  LibreOffice - interface in Scottish Gaelic language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku gaelickim szkockim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-gd
 This package provides resources containing menus and dialogs in
@@ -1423,9 +1349,7 @@ Obsoletes:        openoffice-i18n-gl-gtk
 Obsoletes:     openoffice.org-i18n-gl
 Obsoletes:     openoffice.org-i18n-gl-gtk
 Obsoletes:     openoffice.org-i18n-gl-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-gl
 This package provides resources containing menus and dialogs in
@@ -1441,9 +1365,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku gudźarati
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-gu
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-gu
 This package provides resources containing menus and dialogs in
@@ -1458,9 +1380,7 @@ Summary:  LibreOffice - interface in Paraguayan Gujarati language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku paragwajskim gudźarati
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-gug
 This package provides resources containing menus and dialogs in
@@ -1480,9 +1400,7 @@ Obsoletes:        openoffice-i18n-he-gtk
 Obsoletes:     openoffice.org-i18n-he
 Obsoletes:     openoffice.org-i18n-he-gtk
 Obsoletes:     openoffice.org-i18n-he-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-he
 This package provides resources containing menus and dialogs in Hebrew
@@ -1502,9 +1420,7 @@ Obsoletes:        openoffice-i18n-hi-gtk
 Obsoletes:     openoffice.org-i18n-hi-gtk
 Obsoletes:     openoffice.org-i18n-hi-kde
 Obsoletes:     openoffice.org-i18n-hi_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-hi
 This package provides resources containing menus and dialogs in Hindi
@@ -1524,9 +1440,7 @@ Obsoletes:        openoffice-i18n-hr-gtk
 Obsoletes:     openoffice.org-i18n-hr
 Obsoletes:     openoffice.org-i18n-hr-gtk
 Obsoletes:     openoffice.org-i18n-hr-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-hr
 This package provides resources containing menus and dialogs in
@@ -1546,9 +1460,7 @@ Obsoletes:        openoffice-i18n-hsb-gtk
 Obsoletes:     openoffice.org-i18n-hsb
 Obsoletes:     openoffice.org-i18n-hsb-gtk
 Obsoletes:     openoffice.org-i18n-hsb-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-hsb
 This package provides resources containing menus and dialogs in
@@ -1568,9 +1480,7 @@ Obsoletes:        openoffice-i18n-hu-gtk
 Obsoletes:     openoffice.org-i18n-hu
 Obsoletes:     openoffice.org-i18n-hu-gtk
 Obsoletes:     openoffice.org-i18n-hu-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-hu
 This package provides resources containing menus and dialogs in
@@ -1585,9 +1495,7 @@ Summary:  LibreOffice - interface in Indonesian language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku indonezyjskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-id
 This package provides resources containing menus and dialogs in
@@ -1603,9 +1511,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku islandzkim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-is
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-is
 This package provides resources containing menus and dialogs in
@@ -1625,9 +1531,7 @@ Obsoletes:        openoffice-i18n-it-gtk
 Obsoletes:     openoffice.org-i18n-it
 Obsoletes:     openoffice.org-i18n-it-gtk
 Obsoletes:     openoffice.org-i18n-it-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-it
 This package provides resources containing menus and dialogs in
@@ -1647,9 +1551,7 @@ Obsoletes:        openoffice-i18n-ja-gtk
 Obsoletes:     openoffice.org-i18n-ja
 Obsoletes:     openoffice.org-i18n-ja-gtk
 Obsoletes:     openoffice.org-i18n-ja-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ja
 This package provides resources containing menus and dialogs in Japan
@@ -1665,9 +1567,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku gruzińskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ka
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ka
 This package provides resources containing menus and dialogs in
@@ -1683,9 +1583,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku kabylskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-kab
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-kab
 This package provides resources containing menus and dialogs in
@@ -1701,9 +1599,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku kazachskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-kk
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-kk
 This package provides resources containing menus and dialogs in Kazakh
@@ -1719,9 +1615,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku khmerskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-km
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-km
 This package provides resources containing menus and dialogs in Khmer
@@ -1736,9 +1630,7 @@ Summary:  LibreOffice - interface in Kurdisk language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku kurdyjskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-kmr-Latn
 This package provides resources containing menus and dialogs in
@@ -1757,9 +1649,7 @@ Obsoletes:        openoffice-i18n-kn
 Obsoletes:     openoffice-i18n-kn-gtk
 Obsoletes:     openoffice-i18n-kn-kde
 Obsoletes:     openoffice.org-i18n-kn_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-kn_IN
 This package provides resources containing menus and dialogs in
@@ -1779,9 +1669,7 @@ Obsoletes:        openoffice-i18n-ko-gtk
 Obsoletes:     openoffice.org-i18n-ko
 Obsoletes:     openoffice.org-i18n-ko-gtk
 Obsoletes:     openoffice.org-i18n-ko-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ko
 This package provides resources containing menus and dialogs in Korean
@@ -1797,9 +1685,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku konkani
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-kok
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-kok
 This package provides resources containing menus and dialogs in
@@ -1815,9 +1701,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku kaszmirskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ks
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ks
 This package provides resources containing menus and dialogs in
@@ -1833,9 +1717,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku luksemburgskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-lb
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-lb
 This package provides resources containing menus and dialogs in
@@ -1851,9 +1733,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku laotańskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-lo
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-lo
 This package provides resources containing menus and dialogs in Lao
@@ -1873,9 +1753,7 @@ Obsoletes:        openoffice-i18n-lt-gtk
 Obsoletes:     openoffice.org-i18n-lt
 Obsoletes:     openoffice.org-i18n-lt-gtk
 Obsoletes:     openoffice.org-i18n-lt-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-lt
 This package provides resources containing menus and dialogs in
@@ -1891,9 +1769,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku łotewskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-lv
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-lv
 This package provides resources containing menus and dialogs in
@@ -1909,9 +1785,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku maithili
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-mai
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-mai
 This package provides resources containing menus and dialogs in
@@ -1927,9 +1801,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku macedońskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-mk
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-mk
 This package provides resources containing menus and dialogs in
@@ -1945,9 +1817,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku malajalamskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ml_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ml
 This package provides resources containing menus and dialogs in
@@ -1963,9 +1833,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku manipuri
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-mni
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-mni
 This package provides resources containing menus and dialogs in Meitei
@@ -1981,9 +1849,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku marathi
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-mr_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-mr
 This package provides resources containing menus and dialogs in
@@ -1999,9 +1865,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku mongolskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-mn
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-mn
 This package provides resources containing menus and dialogs in
@@ -2017,9 +1881,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku birmańskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-my
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-my
 This package provides resources containing menus and dialogs in
@@ -2039,9 +1901,7 @@ Obsoletes:        openoffice-i18n-nb-gtk
 Obsoletes:     openoffice.org-i18n-nb
 Obsoletes:     openoffice.org-i18n-nb-gtk
 Obsoletes:     openoffice.org-i18n-nb-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-nb
 This package provides resources containing menus and dialogs in
@@ -2057,9 +1917,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku nepalskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ne
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ne
 This package provides resources containing menus and dialogs in Nepali
@@ -2079,9 +1937,7 @@ Obsoletes:        openoffice-i18n-nl-gtk
 Obsoletes:     openoffice.org-i18n-nl
 Obsoletes:     openoffice.org-i18n-nl-gtk
 Obsoletes:     openoffice.org-i18n-nl-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-nl
 This package provides resources containing menus and dialogs in Dutch
@@ -2101,9 +1957,7 @@ Obsoletes:        openoffice-i18n-nn-gtk
 Obsoletes:     openoffice.org-i18n-nn
 Obsoletes:     openoffice.org-i18n-nn-gtk
 Obsoletes:     openoffice.org-i18n-nn-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-nn
 This package provides resources containing menus and dialogs in
@@ -2119,9 +1973,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku ndebele (południowym)
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-nr
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-nr
 This package provides resources containing menus and dialogs in South
@@ -2141,9 +1993,7 @@ Obsoletes:        openoffice-i18n-nso-gtk
 Obsoletes:     openoffice.org-i18n-nso
 Obsoletes:     openoffice.org-i18n-nso-gtk
 Obsoletes:     openoffice.org-i18n-nso-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-nso
 This package provides resources containing menus and dialogs in
@@ -2159,9 +2009,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku oksytańskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-oc
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-oc
 This package provides resources containing menus and dialogs in
@@ -2177,9 +2025,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku oromo
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-om
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-om
 This package provides resources containing menus and dialogs in Oromo
@@ -2195,9 +2041,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku orija
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-or_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-or
 This package provides resources containing menus and dialogs in Oriya
@@ -2213,9 +2057,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku pendżabskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-pa_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-pa_IN
 This package provides resources containing menus and dialogs in
@@ -2235,9 +2077,7 @@ Obsoletes:        openoffice-i18n-pl-gtk
 Obsoletes:     openoffice.org-i18n-pl
 Obsoletes:     openoffice.org-i18n-pl-gtk
 Obsoletes:     openoffice.org-i18n-pl-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-pl
 This package provides resources containing menus and dialogs in Polish
@@ -2257,9 +2097,7 @@ Obsoletes:        openoffice-i18n-pt-gtk
 Obsoletes:     openoffice.org-i18n-pt
 Obsoletes:     openoffice.org-i18n-pt-gtk
 Obsoletes:     openoffice.org-i18n-pt-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-pt
 This package provides resources containing menus and dialogs in
@@ -2279,9 +2117,7 @@ Obsoletes:        openoffice-i18n-pt_BR-gtk
 Obsoletes:     openoffice.org-i18n-pt_BR
 Obsoletes:     openoffice.org-i18n-pt_BR-gtk
 Obsoletes:     openoffice.org-i18n-pt_BR-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-pt_BR
 This package provides resources containing menus and dialogs in
@@ -2297,9 +2133,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku rumuńskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ro
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ro
 This package provides resources containing menus and dialogs in
@@ -2319,9 +2153,7 @@ Obsoletes:        openoffice-i18n-ru-gtk
 Obsoletes:     openoffice.org-i18n-ru
 Obsoletes:     openoffice.org-i18n-ru-gtk
 Obsoletes:     openoffice.org-i18n-ru-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ru
 This package provides resources containing menus and dialogs in
@@ -2337,9 +2169,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku kinya-ruanda
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-rw
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-rw
 This package provides resources containing menus and dialogs in
@@ -2355,9 +2185,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w sanskrycie
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-sa_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sa_IN
 This package provides resources containing menus and dialogs in
@@ -2373,9 +2201,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku santali
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-sat
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sat
 This package provides resources containing menus and dialogs in
@@ -2391,9 +2217,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku sindhi
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-sd
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sd
 This package provides resources containing menus and dialogs in Sindhi
@@ -2409,9 +2233,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku syngaleskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-si
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-si
 This package provides resources containing menus and dialogs in
@@ -2426,9 +2248,7 @@ Summary:  LibreOffice - interface in Sidama language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku sidamo
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sid
 This package provides resources containing menus and dialogs in Sidama
@@ -2448,9 +2268,7 @@ Obsoletes:        openoffice-i18n-sk-gtk
 Obsoletes:     openoffice.org-i18n-sk
 Obsoletes:     openoffice.org-i18n-sk-gtk
 Obsoletes:     openoffice.org-i18n-sk-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sk
 This package provides resources containing menus and dialogs in Slovak
@@ -2470,9 +2288,7 @@ Obsoletes:        openoffice-i18n-sl-gtk
 Obsoletes:     openoffice.org-i18n-sl
 Obsoletes:     openoffice.org-i18n-sl-gtk
 Obsoletes:     openoffice.org-i18n-sl-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sl
 This package provides resources containing menus and dialogs in
@@ -2487,9 +2303,7 @@ Summary:  LibreOffice - interface in Albanian language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku albańskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sq
 This package provides resources containing menus and dialogs in
@@ -2505,9 +2319,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku serbskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-sr
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sr
 This package provides resources containing menus and dialogs in
@@ -2522,9 +2334,7 @@ Summary:  LibreOffice - interface in Serbian language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku serbskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sr-Latn
 This package provides resources containing menus and dialogs in
@@ -2540,9 +2350,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku suazi (siswati)
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ss
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ss
 This package provides resources containing menus and dialogs in Swati
@@ -2558,9 +2366,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku południowym sotho
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-st
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-st
 This package provides resources containing menus and dialogs in
@@ -2580,9 +2386,7 @@ Obsoletes:        openoffice-i18n-sv-gtk
 Obsoletes:     openoffice.org-i18n-sv
 Obsoletes:     openoffice.org-i18n-sv-gtk
 Obsoletes:     openoffice.org-i18n-sv-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sv
 This package provides resources containing menus and dialogs in
@@ -2598,9 +2402,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku suahili dla Tanzanii
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-sw_TZ
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-sw_TZ
 This package provides resources containing menus and dialogs in
@@ -2616,9 +2418,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku tamiskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ta_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ta
 This package provides resources containing menus and dialogs in Tamil
@@ -2634,9 +2434,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku telugu
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-te_IN
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-te
 This package provides resources containing menus and dialogs in Telugu
@@ -2652,9 +2450,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku tadżyckim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-tg
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-tg
 This package provides resources containing menus and dialogs in Tajik
@@ -2673,9 +2469,7 @@ Obsoletes:        openoffice-i18n-th
 Obsoletes:     openoffice-i18n-th-gtk
 Obsoletes:     openoffice-i18n-th-kde
 Obsoletes:     openoffice.org-i18n-th
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-th
 This package provides resources containing menus and dialogs in Thai
@@ -2694,9 +2488,7 @@ Obsoletes:        openoffice-i18n-tn
 Obsoletes:     openoffice-i18n-tn-gtk
 Obsoletes:     openoffice-i18n-tn-kde
 Obsoletes:     openoffice.org-i18n-tn
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-tn
 This package provides resources containing menus and dialogs in Tswana
@@ -2716,9 +2508,7 @@ Obsoletes:        openoffice-i18n-tr-gtk
 Obsoletes:     openoffice.org-i18n-tr
 Obsoletes:     openoffice.org-i18n-tr-gtk
 Obsoletes:     openoffice.org-i18n-tr-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-tr
 This package provides resources containing menus and dialogs in
@@ -2734,9 +2524,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku tsonga
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ts
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ts
 This package provides resources containing menus and dialogs in Tsonga
@@ -2752,9 +2540,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku tatarskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-tt
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-tt
 This package provides resources containing menus and dialogs in Tatar
@@ -2770,9 +2556,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku ujgurskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ug
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ug
 This package provides resources containing menus and dialogs in Uyghur
@@ -2792,9 +2576,7 @@ Obsoletes:        openoffice-i18n-uk-gtk
 Obsoletes:     openoffice.org-i18n-uk
 Obsoletes:     openoffice.org-i18n-uk-gtk
 Obsoletes:     openoffice.org-i18n-uk-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-uk
 This package provides resources containing menus and dialogs in
@@ -2810,9 +2592,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku uzbeckim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-uz
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-uz
 This package provides resources containing menus and dialogs in Uzbek.
@@ -2827,9 +2607,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku venda
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-ve
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-ve
 This package provides resources containing menus and dialogs in Venda
@@ -2845,9 +2623,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku wietnamskim
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-vi
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-vi
 This package provides resources containing menus and dialogs in
@@ -2863,9 +2639,7 @@ Summary(pl.UTF-8):        LibreOffice - interfejs w języku khosa
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
 Obsoletes:     openoffice.org-i18n-xh
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-xh
 This package provides resources containing menus and dialogs in Xhosa
@@ -2886,9 +2660,7 @@ Obsoletes:        openoffice-i18n-zh_CN-gtk
 Obsoletes:     openoffice.org-i18n-zh_CN
 Obsoletes:     openoffice.org-i18n-zh_CN-gtk
 Obsoletes:     openoffice.org-i18n-zh_CN-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-zh_CN
 This package provides resources containing menus and dialogs in
@@ -2909,9 +2681,7 @@ Obsoletes:        openoffice-i18n-zh_TW-gtk
 Obsoletes:     openoffice.org-i18n-zh_TW
 Obsoletes:     openoffice.org-i18n-zh_TW-gtk
 Obsoletes:     openoffice.org-i18n-zh_TW-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-zh_TW
 This package provides resources containing menus and dialogs in
@@ -2926,9 +2696,7 @@ Summary:  LibreOffice - interface in Venetian language
 Summary(pl.UTF-8):     LibreOffice - interfejs w języku Venetian
 Group:         I18n
 Requires:      %{name}-core = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-vec
 This package provides resources containing menus and dialogs in
@@ -2948,9 +2716,7 @@ Obsoletes:        openoffice-i18n-zu-gtk
 Obsoletes:     openoffice.org-i18n-zu
 Obsoletes:     openoffice.org-i18n-zu-gtk
 Obsoletes:     openoffice.org-i18n-zu-kde
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description i18n-zu
 This package provides resources containing menus and dialogs in Zulu
@@ -2965,11 +2731,9 @@ Summary: bash-completion for LibreOffice
 Summary(pl.UTF-8):     bashowe uzupełnianie nazw dla LibreOffice
 Group:         Applications/Shells
 Requires:      %{name}
-Requires:      bash-completion
+Requires:      bash-completion >= 2.0
 Obsoletes:     bash-completion-openoffice
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description -n bash-completion-%{name}
 bash-completion for LibreOffice.
@@ -2993,9 +2757,9 @@ dialogs.
 %patch0 -p1
 
 for dir in *-%{version}; do
-       [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
+       [ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir
        rm -rf $dir/git-hooks
-       mv $dir/* .
+       %{__mv} $dir/* .
 done
 
 install -d ext_sources
@@ -3185,13 +2949,13 @@ if [ ! -f installed.stamp ]; then
 
        install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/program
        # put share to %{_datadir} so we're able to produce noarch packages
-       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT/%{_datadir}/%{name}
+       %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name}
        ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
-       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
+       %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
        ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
-       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
+       %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
        ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
-       mv $RPM_BUILD_ROOT%{_libdir}/%{name}/program/resource $RPM_BUILD_ROOT%{_datadir}/%{name}/program
+       %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/resource $RPM_BUILD_ROOT%{_datadir}/%{name}/program
        ln -s ../../../share/%{name}/program/resource $RPM_BUILD_ROOT%{_libdir}/%{name}/program/resource
 
        %{__rm} -r $RPM_BUILD_ROOT%{_desktopdir}/*.desktop \