From 8b8e4a55b51536ae9bc9da91fdaf10a905928f61 Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 1 Mar 2024 02:17:37 +0100 Subject: [PATCH 1/2] Update metapackage.spec --- spec2scl/templates/metapackage.spec | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/spec2scl/templates/metapackage.spec b/spec2scl/templates/metapackage.spec index 4a614b1..d5a193e 100644 --- a/spec2scl/templates/metapackage.spec +++ b/spec2scl/templates/metapackage.spec @@ -3,6 +3,24 @@ %global scl_name_version {{data.meta_version}} %global scl %{scl_name_base}%{scl_name_version} +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global brp_python_hardlink /usr/lib/rpm/brp-python-hardlink +%else +%global brp_python_hardlink /usr/lib/rpm/redhat/brp-python-hardlink +%endif +%if 0%{?rhel} == 6 +%global __os_install_post /usr/lib/rpm/brp-compress \ + %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} \ + /usr/lib/rpm/brp-strip-static-archive %{__strip} \ + /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} +%else +%global __os_install_post /usr/lib/rpm/brp-compress \ + %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} \ + /usr/lib/rpm/brp-strip-static-archive %{__strip} \ + /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \ + %{brp_python_hardlink} +%endif + %scl_package %scl %global install_scl 1 From 74a2219e6a5f5c97c6a1673d149fb339b2d3211f Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 1 Mar 2024 02:26:53 +0100 Subject: [PATCH 2/2] Update generic.py --- spec2scl/transformers/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec2scl/transformers/generic.py b/spec2scl/transformers/generic.py index afa738f..5daefc9 100644 --- a/spec2scl/transformers/generic.py +++ b/spec2scl/transformers/generic.py @@ -18,7 +18,7 @@ def __init__(self, options={}): @matches(r'^', one_line=False, sections=['%header']) def insert_scl_init(self, original_spec, pattern, text): - scl_init = '%{{?scl:%scl_package {0}}}\n%{{!?scl:%global pkg_name %{{name}}}}'.format(self.get_original_name(original_spec)) + scl_init = '%{{?scl:%scl_package {0}}}\n%{{!?scl:%global pkg_name %{{name}}}}\n%if 0%{?fedora} || 0%{?rhel} >= 7\n%global brp_python_hardlink /usr/lib/rpm/brp-python-hardlink\n%else\n%global brp_python_hardlink /usr/lib/rpm/redhat/brp-python-hardlink\n%endif\n%if 0%{?rhel} == 6\n%global __os_install_post /usr/lib/rpm/brp-compress %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} /usr/lib/rpm/brp-strip-static-archive %{__strip} /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump}\n%else\n%global __os_install_post /usr/lib/rpm/brp-compress %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} /usr/lib/rpm/brp-strip-static-archive %{__strip} /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} %{brp_python_hardlink}\n%endif'.format(self.get_original_name(original_spec)) return '{0}\n\n{1}'.format(scl_init, text) @matches(r'(?