noarch in main package is unconditional (thanks glen)

- make noarch actually work by avoiding requirement of working compiler
  which fails when build type is "noarch-pld-linux"

diff --git a/mozo-noarch.patch b/mozo-noarch.patch
new file mode 100644 (file)
index 0000000..a22e3cc
--- /dev/null
+++ b/mozo-noarch.patch
@@ -0,0 +1,12 @@
+diff --color -urN mozo-1.24.0.orig/configure.ac mozo-1.24.0/configure.ac
+--- mozo-1.24.0.orig/configure.ac      2020-02-10 14:16:49.000000000 +0100
++++ mozo-1.24.0/configure.ac   2020-10-18 15:05:05.142863402 +0200
+@@ -17,7 +17,7 @@
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+ AM_GNU_GETTEXT_VERSION([0.19.8])
+ AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
+-AM_GNU_GETTEXT([external])
++AM_PO_SUBDIRS
+ 
+ AM_PATH_PYTHON(3.5)
+ 

diff --git a/mozo.spec b/mozo.spec
index 89332ea54075a8463f61360a7cabcdbdf23e4c99..9b0d8c51480b684933ee879efd0c12a3cbe9fe6e 100644 (file)
--- a/mozo.spec
+++ b/mozo.spec
@@ -7,6 +7,7 @@ License:        GPL v2
 Group:         X11/Applications
 Source0:       http://pub.mate-desktop.org/releases/1.24/%{name}-%{version}.tar.xz
 # Source0-md5: 78b9b8d4cb85856d814649b3e5ad1fbc
+Patch0:                %{name}-noarch.patch
 URL:           http://mate-desktop.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.7
@@ -17,7 +18,7 @@ BuildRequires:        python3 >= 1:3.5
 BuildRequires: python3-pygobject3 >= 3.0
 BuildRequires: python-pygobject3-common-devel >= 3.0
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires(post,postun): gtk-update-icon-cache
@@ -29,7 +30,7 @@ Requires:     mate-menus-libs >= 1.21.0
 Requires:      python3 >= 1:3.5
 Requires:      python3-pygobject3 >= 3.0
 Obsoletes:     mate-menu-editor
-%{?noarchpackage}
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,6 +47,7 @@ Mozo to odgałęzienie projektu Alacarte.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}