[packages/mozo] noarch in main package is unconditional (thanks glen)

atler atler at pld-linux.org
Sun Oct 18 15:09:31 CEST 2020


commit a86833cc62cb047ef6c6d31445645edd1cd49734
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Oct 18 14:55:06 2020 +0200

    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"

 mozo-noarch.patch | 12 ++++++++++++
 mozo.spec         |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/mozo.spec b/mozo.spec
index 89332ea..9b0d8c5 100644
--- 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}
diff --git a/mozo-noarch.patch b/mozo-noarch.patch
new file mode 100644
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)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mozo.git/commitdiff/a86833cc62cb047ef6c6d31445645edd1cd49734



More information about the pld-cvs-commit mailing list