diff --git a/PKGBUILD b/PKGBUILD index 8fafaf2..d74516f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-set_version -pkgver=0.6.1 +pkgver=0.6.6 pkgrel=0 pkgdesc="An OBS source service: Update spec file version" arch=('i686' 'x86_64') diff --git a/_service b/_service index 3fb52f5..e36e424 100644 --- a/_service +++ b/_service @@ -1,20 +1,20 @@ - + https://github.com/openSUSE/obs-service-set_version.git git .git - git-master + master @PARENT_TAG@ master enable - + *.tar gz - + obs-service-set_version diff --git a/_servicedata b/_servicedata index 035137d..257d481 100644 --- a/_servicedata +++ b/_servicedata @@ -4,4 +4,4 @@ eaedc529acba421821e0e5dcb4956c66e7f315a9 https://github.com/openSUSE/obs-service-set_version.git - d4150d2cf2c80788efd5e9dff6bc4fd033c74a93 \ No newline at end of file + 5a4de9958df115ddff484083f2a1cb0aaa9e776a \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index aefc10f..c1e3e63 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-set_version -Version: 0.6.1-0 +Version: 0.6.6-0 Binary: obs-service-set_version Provides: obs-service-set_version Maintainer: Dirk Mueller diff --git a/obs-service-set_version-0.6.2.tar.gz b/obs-service-set_version-0.6.2.tar.gz deleted file mode 100644 index b11027a..0000000 --- a/obs-service-set_version-0.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:373b6b44fce06ff1e8ae1ec0219b4c67058ec47b7997b10e6ca52a33f7456f28 -size 22180 diff --git a/obs-service-set_version-0.6.6.tar.gz b/obs-service-set_version-0.6.6.tar.gz new file mode 100644 index 0000000..e52e3c7 --- /dev/null +++ b/obs-service-set_version-0.6.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5afcb72241f166a610f92a41dad8ebf01f99aa68a67e473c3b49229d6d798232 +size 24122 diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index 72469c8..db273fe 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Jul 16 11:43:30 UTC 2024 - adrian@suse.de + +- Update to version 0.6.6: + * Hardcode "0" as release for PKGBUILD as well + +------------------------------------------------------------------- +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 + +- 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 + +- 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 + +- Update to version 0.6.4: + * Treat LegacyVersion as InvalidVersion + * Add testing python 3.10 - 3.12 + +------------------------------------------------------------------- +Mon May 06 14:28:11 UTC 2024 - dmueller@suse.com + +- Update to version 0.6.3: + * [dist] import spec file from O:S:U + * Mute warning about missing EMAIL env variable in unit tests + * Fix unit tests + * Replace invalid use of os.errno with errno module + * Replace @VERSION@ placeholders in .dsc files + * Remove usage of deprecated imp module with importlib + * Detect revision and set pkgrel for Arch packages + +------------------------------------------------------------------- +Wed Jan 17 14:44:40 UTC 2024 - Dirk Müller + +- add support for AL2023 + +------------------------------------------------------------------- +Thu Jun 1 15:22:42 UTC 2023 - Edward Baudrez + +- Builds on CentOS_[5678] and possibly other distros failed because + their 'rpm' didn't recognize the "Recommends:" tag. I've wrapped + that tag in an "%if 0%{?suse_version}" to work around it. + Build is now passing on the CentOS distros. + ------------------------------------------------------------------- Wed Jan 18 13:39:25 UTC 2023 - dmueller@suse.com @@ -23,7 +79,7 @@ Thu Jan 05 09:07:08 UTC 2023 - dmueller@suse.com ------------------------------------------------------------------- Mon Dec 13 10:46:10 UTC 2021 - Dirk Müller -- simplifiy conditions for all rhel like distros to skip testsuite +- simplifiy conditions for all rhel like distros to skip testsuite ------------------------------------------------------------------- Wed Jul 14 09:32:33 UTC 2021 - FSchreiner@suse.com @@ -80,13 +136,13 @@ Thu May 9 10:33:23 UTC 2019 - John Whately ------------------------------------------------------------------- Sat May 4 05:25:59 UTC 2019 - John Whately -- fix for Fedora 30/Rawhide +- fix for Fedora 30/Rawhide ------------------------------------------------------------------- Mon Nov 26 18:04:26 CET 2018 - ro@suse.de - for now obs_scm_testsuite only for > 1315, needed python stuff - not available otherwise + not available otherwise ------------------------------------------------------------------- Fri Nov 16 18:09:57 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 6ffb2e9..ca7ae3d 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package obs-service-set_version # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%if 0%{?rhel} || ( 0%{?suse_version} && 0%{?suse_version} <= 1315 ) +%if 0%{?rhel} || 0%{?amzn} || ( 0%{?suse_version} && 0%{?suse_version} <= 1315 ) %bcond_with obs_scm_testsuite %else %bcond_without obs_scm_testsuite @@ -24,7 +24,7 @@ %define service set_version Name: obs-service-%{service} -Version: 0.6.2 +Version: 0.6.6 Release: 0 Summary: An OBS source service: Update spec file version License: GPL-2.0-or-later @@ -40,12 +40,12 @@ 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} Recommends: python3-packaging +%endif %description This is a source service for openSUSE Build Service. @@ -66,6 +66,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 /usr/bin/python3)@" \ + %{buildroot}%{_prefix}/lib/obs/service/set_version %files %defattr(-,root,root)