From 4a547e36a8be21f10225ecfcd537b23657e07ceb Mon Sep 17 00:00:00 2001 From: Manith Date: Thu, 28 Sep 2023 13:13:14 +0000 Subject: [PATCH] eext: Fix incorrect 'Release' macro in spec files Release macro in eext packages' spec files were created with incorrect values. Issue arises due to naming the rpmReleaseMacro as 'release' too, which conflicts with the macro for 'Release'. Instead using 'eext_release' to denote rpmReleaseMacro to resolve conflict. --- cmd/testData/debugedit-1/spec/debugedit.spec | 2 +- cmd/testData/mrtparse-1/spec/mrtparse.spec | 16 ++++++++-------- .../mrtparse-2/mrtparse/spec/mrtparse.spec | 16 ++++++++-------- impl/create_srpm.go | 2 +- impl/mock_cfg.go | 2 +- impl/testData/expected-mock.cfg | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmd/testData/debugedit-1/spec/debugedit.spec b/cmd/testData/debugedit-1/spec/debugedit.spec index c89693b..168a0bf 100644 --- a/cmd/testData/debugedit-1/spec/debugedit.spec +++ b/cmd/testData/debugedit-1/spec/debugedit.spec @@ -4,7 +4,7 @@ Name: debugedit Version: 5.0 -Release: %{?release:%{release}}%{!?release:eng} +Release: %{?eext_release:%{eext_release}}%{!?eext_release:eng} Summary: Tools for debuginfo creation License: GPLv3+ and GPLv2+ and LGPLv2+ URL: https://sourceware.org/debugedit/ diff --git a/cmd/testData/mrtparse-1/spec/mrtparse.spec b/cmd/testData/mrtparse-1/spec/mrtparse.spec index 1312cac..c581380 100644 --- a/cmd/testData/mrtparse-1/spec/mrtparse.spec +++ b/cmd/testData/mrtparse-1/spec/mrtparse.spec @@ -5,17 +5,17 @@ Patch1000: arista-remove-default-sigpipe.patch Summary: Tool for parsing routing information dump files in MRT format Name: mrtparse Version: 2.0.1 -Release: %{?release:%{release}}%{!?release:eng} +Release: %{?eext_release:%{eext_release}}%{!?eext_release:eng} -License: Apache +License: Apache Source0: mrtparse-2.0.1.tar.gz Url: https://github.com/YoshiyukiYamauchi/mrtparse BuildArch: noarch %description -mrtprse is a module to read and analyze the MRT format data. The MRT format data -can be used to export routing protocol messages, state changes, and routing -information base contents, and is standardized in RFC6396. Programs like Quagga +mrtprse is a module to read and analyze the MRT format data. The MRT format data +can be used to export routing protocol messages, state changes, and routing +information base contents, and is standardized in RFC6396. Programs like Quagga / Zebra, BIRD, OpenBGPD and PyRT can dump the MRT fotmat data. %package -n python3-mrtparse @@ -25,9 +25,9 @@ BuildRequires: python3-setuptools %{?python_provide:%python_provide python3-mrtparse} %description -n python3-mrtparse -mrtprse is a module to read and analyze the MRT format data. The MRT format data -can be used to export routing protocol messages, state changes, and routing -information base contents, and is standardized in RFC6396. Programs like Quagga +mrtprse is a module to read and analyze the MRT format data. The MRT format data +can be used to export routing protocol messages, state changes, and routing +information base contents, and is standardized in RFC6396. Programs like Quagga / Zebra, BIRD, OpenBGPD and PyRT can dump the MRT fotmat data. %prep diff --git a/cmd/testData/mrtparse-2/mrtparse/spec/mrtparse.spec b/cmd/testData/mrtparse-2/mrtparse/spec/mrtparse.spec index 1312cac..c581380 100644 --- a/cmd/testData/mrtparse-2/mrtparse/spec/mrtparse.spec +++ b/cmd/testData/mrtparse-2/mrtparse/spec/mrtparse.spec @@ -5,17 +5,17 @@ Patch1000: arista-remove-default-sigpipe.patch Summary: Tool for parsing routing information dump files in MRT format Name: mrtparse Version: 2.0.1 -Release: %{?release:%{release}}%{!?release:eng} +Release: %{?eext_release:%{eext_release}}%{!?eext_release:eng} -License: Apache +License: Apache Source0: mrtparse-2.0.1.tar.gz Url: https://github.com/YoshiyukiYamauchi/mrtparse BuildArch: noarch %description -mrtprse is a module to read and analyze the MRT format data. The MRT format data -can be used to export routing protocol messages, state changes, and routing -information base contents, and is standardized in RFC6396. Programs like Quagga +mrtprse is a module to read and analyze the MRT format data. The MRT format data +can be used to export routing protocol messages, state changes, and routing +information base contents, and is standardized in RFC6396. Programs like Quagga / Zebra, BIRD, OpenBGPD and PyRT can dump the MRT fotmat data. %package -n python3-mrtparse @@ -25,9 +25,9 @@ BuildRequires: python3-setuptools %{?python_provide:%python_provide python3-mrtparse} %description -n python3-mrtparse -mrtprse is a module to read and analyze the MRT format data. The MRT format data -can be used to export routing protocol messages, state changes, and routing -information base contents, and is standardized in RFC6396. Programs like Quagga +mrtprse is a module to read and analyze the MRT format data. The MRT format data +can be used to export routing protocol messages, state changes, and routing +information base contents, and is standardized in RFC6396. Programs like Quagga / Zebra, BIRD, OpenBGPD and PyRT can dump the MRT fotmat data. %prep diff --git a/impl/create_srpm.go b/impl/create_srpm.go index 589bddc..80b6e2b 100644 --- a/impl/create_srpm.go +++ b/impl/create_srpm.go @@ -392,7 +392,7 @@ func (bldr *srpmBuilder) build(prep bool) error { if rpmReleaseMacro != "" { rpmbuildArgs = append(rpmbuildArgs, []string{ - "--define", fmt.Sprintf("release %s", rpmReleaseMacro), + "--define", fmt.Sprintf("eext_release %s", rpmReleaseMacro), }...) } rpmbuildArgs = append(rpmbuildArgs, specFile) diff --git a/impl/mock_cfg.go b/impl/mock_cfg.go index 426151a..1684e08 100644 --- a/impl/mock_cfg.go +++ b/impl/mock_cfg.go @@ -58,7 +58,7 @@ func (cfgBldr *mockCfgBuilder) populateTemplateData() error { cfgBldr.templateData.Macros = make(map[string]string) if cfgBldr.rpmReleaseMacro != "" { - cfgBldr.templateData.Macros["release"] = cfgBldr.rpmReleaseMacro + cfgBldr.templateData.Macros["eext_release"] = cfgBldr.rpmReleaseMacro } if cfgBldr.eextSignature != "" { diff --git a/impl/testData/expected-mock.cfg b/impl/testData/expected-mock.cfg index c70fa06..d0b3d0d 100644 --- a/impl/testData/expected-mock.cfg +++ b/impl/testData/expected-mock.cfg @@ -18,7 +18,7 @@ config_opts['target_arch'] = "x86_64" # Autogenerated macros config_opts['macros']['distribution'] = 'eextsig=my-signature' -config_opts['macros']['release'] = 'my-release' +config_opts['macros']['eext_release'] = 'my-release' # Autogenerated dnf.conf config_opts['dnf.conf'] = """