From 7de13ba7fe290358820bb7f477419eeb3c2763e5 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Mon, 10 Feb 2020 18:55:48 +0100 Subject: [PATCH] up to 1.24.0 --- mate-icon-theme.spec | 10 ++++++---- noarch-build.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 noarch-build.patch diff --git a/mate-icon-theme.spec b/mate-icon-theme.spec index e8640db..3c6d6c3 100644 --- a/mate-icon-theme.spec +++ b/mate-icon-theme.spec @@ -1,17 +1,18 @@ Summary: Icon theme for MATE Desktop Summary(pl.UTF-8): Motyw ikon dla środowiska MATE Desktop Name: mate-icon-theme -Version: 1.22.2 +Version: 1.24.0 Release: 1 License: LGPL v3 or CC-BY-SA v3.0 Group: Themes -Source0: http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz -# Source0-md5: dba9b4b212f82645d616a5533f31fdbc +Source0: http://pub.mate-desktop.org/releases/1.24/%{name}-%{version}.tar.xz +# Source0-md5: 8dba4ebbbbadb4d95d3f7f6af0c58636 URL: http://wiki.mate-desktop.org/mate-icon-theme +Patch0: noarch-build.patch BuildRequires: autoconf >= 2.53 BuildRequires: automake >= 1:1.9 +BuildRequires: gettext-tools >= 0.19.8 BuildRequires: icon-naming-utils >= 0.8.7 -BuildRequires: intltool >= 0.40.0 BuildRequires: mate-common BuildRequires: pkgconfig >= 1:0.19 BuildRequires: tar >= 1:1.22 @@ -44,6 +45,7 @@ Motyw ikon Menta dla środowiska MATE Desktop. %prep %setup -q +%patch0 -p1 %build %{__aclocal} diff --git a/noarch-build.patch b/noarch-build.patch new file mode 100644 index 0000000..62eae9f --- /dev/null +++ b/noarch-build.patch @@ -0,0 +1,31 @@ +From a943b0b04362bcda9bb3ab29c01bc19a229545b9 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Mon, 10 Feb 2020 18:54:06 +0100 +Subject: [PATCH] build: do not invoke AM_GNU_GETTEXT + +mate-icon-theme does not link with anything, the only desired side +effect of AM_GNU_GETTEXT is AM_PO_SUBDIRS invocation. It fixes packages +built specifically without any arch specific pieces and therefore with +potentially unknown triplet like noarch-pld-linux. + +Signed-off-by: Jan Palus +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 52628cf..fb79661 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,7 @@ PKG_PROG_PKG_CONFIG([0.19]) + + AM_GNU_GETTEXT_VERSION([0.19.8]) + AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +-AM_GNU_GETTEXT([external]) ++AM_PO_SUBDIRS + + GETTEXT_PACKAGE="${PACKAGE}" + AC_SUBST(GETTEXT_PACKAGE) +-- +2.25.0 + -- 2.44.0