From 3aa3c094342aa9510c2f4f9c41455b77662164214706fa2b762ca9d1edf73af9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 21 Jul 2020 08:57:05 +0000 Subject: [PATCH] Accepting request 821755 from home:gmbr3:Active - Fix name tag for multibuild OBS-URL: https://build.opensuse.org/request/show/821755 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=81 --- automake.changes | 5 +++++ automake.spec | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/automake.changes b/automake.changes index f265550..f983651 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 17 09:03:35 UTC 2020 - Callum Farmer + +- Fix name tag for multibuild + ------------------------------------------------------------------- Fri Jul 10 14:54:32 UTC 2020 - Callum Farmer diff --git a/automake.spec b/automake.spec index 9525c1a..d40e99e 100644 --- a/automake.spec +++ b/automake.spec @@ -19,7 +19,13 @@ # remove bogus Automake perl dependencies and provides %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: -Name: automake +%define flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "testsuite" +%define nsuffix -testsuite +%else +%define nsuffix %{nil} +%endif +Name: automake%{nsuffix} Version: 1.16.2 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files @@ -50,7 +56,7 @@ Requires: perl Requires(post): info Requires(preun): info BuildArch: noarch -%if "@BUILD_FLAVOR@%{nil}" == "testsuite" +%if "%{flavor}" == "testsuite" BuildRequires: cscope BuildRequires: dejagnu BuildRequires: expect @@ -92,7 +98,7 @@ sh bootstrap %configure --docdir=%{_docdir}/%{name} %make_build #%%{?_smp_mflags} -%if "@BUILD_FLAVOR@%{nil}" == "testsuite" +%if "%{flavor}" == "testsuite" %check # Some architectures can't keep up the pace. %ifnarch alpha %{arm} @@ -118,7 +124,7 @@ rm -rf %{buildroot}%{_infodir}/dir %preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info%{ext_info} -%if "@BUILD_FLAVOR@%{nil}" == "" +%if "%{flavor}" == "" %files %doc %{_docdir}/%{name} %{_bindir}/*