From bf3e22defa10137394a3e1b1ddf90f6a9c5d68b2ab861d4a7251140e9b52da76 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 18 Jun 2024 15:27:19 +0000 Subject: [PATCH 1/3] - Fix shebang of the script to use the explicit version of Python (bsc#1212476). OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=136 --- obs-service-set_version.changes | 6 ++++++ obs-service-set_version.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index a4aa247..d614d64 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 14 18:33:15 UTC 2024 - Matej Cepl + +- Fix shebang of the script to use the explicit version of Python + (bsc#1212476). + ------------------------------------------------------------------- Tue May 14 16:03:17 UTC 2024 - dmueller@suse.com diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index c3411ae..5544856 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -68,6 +68,9 @@ make test PYTHON=python3 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)@" \ + %{buildroot}%{_prefix}/lib/obs/service/set_version %files %defattr(-,root,root) From c83ac04544d168701454af02d78763c6919107b34fde994663b93f5527104f18 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 18 Jun 2024 15:32:18 +0000 Subject: [PATCH 2/3] - Update to version 0.6.5: * Move revision detection into _revision_detect OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=137 --- PKGBUILD | 4 ++-- _servicedata | 2 +- debian.dsc | 2 +- obs-service-set_version-0.6.4.tar.gz | 3 --- obs-service-set_version-0.6.5.tar.gz | 3 +++ obs-service-set_version.changes | 7 +++++++ obs-service-set_version.spec | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 obs-service-set_version-0.6.4.tar.gz create mode 100644 obs-service-set_version-0.6.5.tar.gz diff --git a/PKGBUILD b/PKGBUILD index aaa9a67..b37d62d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=obs-service-set_version -pkgver=0.6.4 -pkgrel=0 +pkgver=0.6.5 +pkgrel=63f5e5046c60476b2ecee091b21aaf04 pkgdesc="An OBS source service: Update spec file version" arch=('i686' 'x86_64') url="https://www.github.com/openSUSE/obs-service-set_version" diff --git a/_servicedata b/_servicedata index d2ab33c..7e1bf16 100644 --- a/_servicedata +++ b/_servicedata @@ -4,4 +4,4 @@ eaedc529acba421821e0e5dcb4956c66e7f315a9 https://github.com/openSUSE/obs-service-set_version.git - 9bfad978a01befdbb58a573ee0b571464116319a \ No newline at end of file + 095866e87fb65adb398dde711961b8cf639035a9 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 14530da..a4ec22f 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set_version -Version: 0.6.4-0 +Version: 0.6.5-0 Binary: obs-service-set_version Provides: obs-service-set_version Maintainer: Dirk Mueller diff --git a/obs-service-set_version-0.6.4.tar.gz b/obs-service-set_version-0.6.4.tar.gz deleted file mode 100644 index e0f9e61..0000000 --- a/obs-service-set_version-0.6.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7340b5c583a87f0cbcbad07af5719108c6c9d7fad7750a86a7cdbb1d520af76b -size 23886 diff --git a/obs-service-set_version-0.6.5.tar.gz b/obs-service-set_version-0.6.5.tar.gz new file mode 100644 index 0000000..68455ce --- /dev/null +++ b/obs-service-set_version-0.6.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3d8558e32305a339b568a3ec58caba92f9e1bca8871222b5902669d1e1c8f0c +size 23926 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index d614d64..c975dcd 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 18 15:31:41 UTC 2024 - dmueller@suse.com + +- Update to version 0.6.5: + * Update spec file to the one used in the packaging + * Move revision detection into _revision_detect + ------------------------------------------------------------------- Fri Jun 14 18:33:15 UTC 2024 - Matej Cepl diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 5544856..4bf57e8 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -24,7 +24,7 @@ %define service set_version Name: obs-service-%{service} -Version: 0.6.4 +Version: 0.6.5 Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0-or-later From b469da473772e3107bec02879b8fc5c8e7fb6a45443fae86efe0bb22fd6f28c6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 20 Jun 2024 07:59:46 +0000 Subject: [PATCH 3/3] - 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