From b469da473772e3107bec02879b8fc5c8e7fb6a45443fae86efe0bb22fd6f28c6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 20 Jun 2024 07:59:46 +0000 Subject: [PATCH] - expand __python3 with python3 to work outside suse rpm packaging OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=138 --- obs-service-set_version.changes | 5 +++++ obs-service-set_version.spec | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index c975dcd..8191d8b 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 20 07:59:18 UTC 2024 - Dirk Müller + +- expand __python3 with python3 to work outside suse rpm packaging + ------------------------------------------------------------------- Tue Jun 18 15:31:41 UTC 2024 - dmueller@suse.com diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 4bf57e8..083e0c1 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -40,9 +40,7 @@ BuildRequires: python3-flake8 BuildRequires: python3-packaging %endif -%if 0%{?suse_version} > 1315 -Requires: python3-base -%else +%if !0%{?suse_version} Requires: python3 %endif %if 0%{?suse_version} @@ -69,7 +67,7 @@ mkdir -p %{buildroot}%{_prefix}/lib/obs/service install -m 0755 set_version %{buildroot}%{_prefix}/lib/obs/service install -m 0644 set_version.service %{buildroot}%{_prefix}/lib/obs/service # Doing %%python3_fix_shebang_path old fashioned way for the backward compatibility -sed -i "1s@#\\!.*python\S*@#\\!$(realpath %__python3)@" \ +sed -i "1s@#\\!.*python\S*@#\\!$(realpath /usr/bin/python3)@" \ %{buildroot}%{_prefix}/lib/obs/service/set_version %files