From 99b47b93211d2e2268b04fa46183620388b20560af88efc5363e82a2f9536a28 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 13 Jun 2023 14:38:53 +0000 Subject: [PATCH 1/5] updated dsc and spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=324 --- debian.dsc | 2 +- obs-service-tar_scm.spec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian.dsc b/debian.dsc index 7416a0e..f7878c6 100644 --- a/debian.dsc +++ b/debian.dsc @@ -6,7 +6,7 @@ Binary: obs-service-tar_scm Maintainer: Adrian Schroeter Architecture: all Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 8.0.0), python3, python-argparse, python3-dateutil, dh-python +Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python, python3-yaml Package: obs-service-tar-scm Architecture: all diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 531eca4..9f96358 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -138,7 +138,6 @@ BuildRequires: %{pkg_name} = %{version} BuildRequires: %{use_python}-keyring BuildRequires: %{use_python}-keyrings.alt BuildRequires: %{use_python}-six -BuildRequires: %{use_python}-unittest2 BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial From c2afb48621eb0ba89e994036b928bc09463a51bc90acb1e8e23ed80c135fc853 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 13 Jun 2023 16:04:40 +0000 Subject: [PATCH 2/5] Accepting request 1092910 from home:M0ses:branches:openSUSE:Tools * new version 0.10.37 * update debian.dsc via services OBS-URL: https://build.opensuse.org/request/show/1092910 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=325 --- PKGBUILD | 2 +- _service | 8 +++----- _servicedata | 25 +++++++++++++------------ debian.dsc | 2 +- obs-service-tar_scm-0.10.36.tar.gz | 3 --- obs-service-tar_scm-0.10.37.tar.gz | 3 +++ obs-service-tar_scm.spec | 4 ++-- 7 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.36.tar.gz create mode 100644 obs-service-tar_scm-0.10.37.tar.gz diff --git a/PKGBUILD b/PKGBUILD index df92755..439ddb8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.36 +pkgver=0.10.37 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_service b/_service index f4abc4a..805251f 100644 --- a/_service +++ b/_service @@ -3,15 +3,13 @@ https://github.com/openSUSE/obs-service-tar_scm.git git .git - 0.10.36 enable + master + @PARENT_TAG@ dist/obs-service-tar_scm.spec - v(.*) - 0.10.36 - obs-service-tar_scm diff --git a/_servicedata b/_servicedata index 9ac7344..45c3652 100644 --- a/_servicedata +++ b/_servicedata @@ -2,15 +2,16 @@ git://github.com/adrianschroeter/obs-service-tar_scm.git d44d677cf006d48b261f5e2054ba2126bed64ae1 - - git://github.com/M0ses/obs-service-tar_scm.git - 9e8b88b088778c44db56781e6a908a0e82e27cf2 - - git://github.com/openSUSE/obs-service-tar_scm.git - 85bfc3fabb06212b49a389afb3310bfbf2996913 - https://github.com/openSUSE/obs-service-tar_scm.git - gpg: Signature made Fri 19 May 2023 02:54:32 PM CEST -gpg: using RSA key D50175CE6FE935BBF28602C5918D8C954C08DB67 -gpg: Good signature from "Adrian Schroeter (OBS Project Manager) <adrian@suse.de>" [ultimate] -Primary key fingerprint: D501 75CE 6FE9 35BB F286 02C5 918D 8C95 4C08 DB67 -cf704bc3d3eaa7867c2ca6c029112c26b58294ef \ No newline at end of file + + git://github.com/M0ses/obs-service-tar_scm.git + 9e8b88b088778c44db56781e6a908a0e82e27cf2 + + + git://github.com/openSUSE/obs-service-tar_scm.git + 85bfc3fabb06212b49a389afb3310bfbf2996913 + + + https://github.com/openSUSE/obs-service-tar_scm.git + cf704bc3d3eaa7867c2ca6c029112c26b58294ef + + diff --git a/debian.dsc b/debian.dsc index f7878c6..7fcd568 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.36 +Version: 0.10.37 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm-0.10.36.tar.gz b/obs-service-tar_scm-0.10.36.tar.gz deleted file mode 100644 index ff77cf4..0000000 --- a/obs-service-tar_scm-0.10.36.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c50d8ce93646e149fa78c21e1d187428d1ff0c21e74833c489aacb445fc186b4 -size 156768 diff --git a/obs-service-tar_scm-0.10.37.tar.gz b/obs-service-tar_scm-0.10.37.tar.gz new file mode 100644 index 0000000..0c79dfb --- /dev/null +++ b/obs-service-tar_scm-0.10.37.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89feae9fe54a8ee2394c5cb076536f8f111896d0743a24d1a41b56c5cdf6448b +size 157282 diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 9f96358..f3bba95 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -119,8 +119,8 @@ Recommends: %{use_python}-keyrings.alt \ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.36 -Version: 0.10.36 +%define version_unconverted 0.10.37 +Version: 0.10.37 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later From 5a28fe5246fbcc4a7f90233902e64b82506087b03dd183dbb5a01b2537ce8048 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 14 Jun 2023 08:57:24 +0000 Subject: [PATCH 3/5] enable testing for fedora OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=326 --- obs-service-tar_scm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index f3bba95..2f839c0 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -29,7 +29,7 @@ %define nsuffix -test %endif -%if 0%{?suse_version} && 0%{?suse_version} >= 1220 && "%{flavor}" == "test" +%if ( 0%{?fedora_version} || ( 0%{?suse_version} && 0%{?suse_version} >= 1220)) && "%{flavor}" == "test" %bcond_without obs_scm_testsuite %else %bcond_with obs_scm_testsuite @@ -136,7 +136,11 @@ Source: %{pkg_name}-%{version}.tar.gz BuildRequires: %{locale_package} BuildRequires: %{pkg_name} = %{version} BuildRequires: %{use_python}-keyring +%if 0%{?fedora_version} +BuildRequires: %{use_python}-keyrings-alt +%else BuildRequires: %{use_python}-keyrings.alt +%endif BuildRequires: %{use_python}-six BuildRequires: bzr BuildRequires: git-core From 77fbe691fa04c9804a2dc4b58ba36e4de7f110135d479bdd17f44a3f93f47252 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 5 Jul 2023 12:36:57 +0000 Subject: [PATCH 4/5] - Update to version 0.10.38: * Python 2 is no longer supported by GitHub actions, stop testing it * FD leak / flake8 / py311 fixes * updated debian files * disabled pylint 'no-member' because of false positives in py311 * removed unittest2 from BuildRequires in spec * fixed fixtures and new Exception class * updated KankuFile to Tumbleweed and removed python2 tests OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=327 --- PKGBUILD | 2 +- _servicedata | 4 ++-- debian.dsc | 2 +- obs-service-tar_scm-0.10.37.tar.gz | 3 --- obs-service-tar_scm-0.10.38.tar.gz | 3 +++ obs-service-tar_scm.changes | 12 ++++++++++++ obs-service-tar_scm.spec | 10 +++------- 7 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.37.tar.gz create mode 100644 obs-service-tar_scm-0.10.38.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 439ddb8..13449af 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.37 +pkgver=0.10.38 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 45c3652..c0b62be 100644 --- a/_servicedata +++ b/_servicedata @@ -12,6 +12,6 @@ https://github.com/openSUSE/obs-service-tar_scm.git - cf704bc3d3eaa7867c2ca6c029112c26b58294ef + 96a0e7409c6405f46feab29f8d0e012bb2e84859 - + \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 7fcd568..0e4145d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.37 +Version: 0.10.38 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm-0.10.37.tar.gz b/obs-service-tar_scm-0.10.37.tar.gz deleted file mode 100644 index 0c79dfb..0000000 --- a/obs-service-tar_scm-0.10.37.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89feae9fe54a8ee2394c5cb076536f8f111896d0743a24d1a41b56c5cdf6448b -size 157282 diff --git a/obs-service-tar_scm-0.10.38.tar.gz b/obs-service-tar_scm-0.10.38.tar.gz new file mode 100644 index 0000000..81747fa --- /dev/null +++ b/obs-service-tar_scm-0.10.38.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9a6971bd1ae6650e7d879654f8e371d73edd678a27eda47a5ed13c4f87557bc +size 154856 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 73bfe80..c4f5043 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jul 05 12:33:14 UTC 2023 - dmueller@suse.com + +- Update to version 0.10.38: + * Python 2 is no longer supported by GitHub actions, stop testing it + * FD leak / flake8 / py311 fixes + * updated debian files + * disabled pylint 'no-member' because of false positives in py311 + * removed unittest2 from BuildRequires in spec + * fixed fixtures and new Exception class + * updated KankuFile to Tumbleweed and removed python2 tests + ------------------------------------------------------------------- Fri May 19 14:37:24 UTC 2023 - adrian@suse.de diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 2f839c0..fe7b488 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -29,7 +29,7 @@ %define nsuffix -test %endif -%if ( 0%{?fedora_version} || ( 0%{?suse_version} && 0%{?suse_version} >= 1220)) && "%{flavor}" == "test" +%if 0%{?suse_version} && 0%{?suse_version} >= 1220 && "%{flavor}" == "test" %bcond_without obs_scm_testsuite %else %bcond_with obs_scm_testsuite @@ -119,8 +119,8 @@ Recommends: %{use_python}-keyrings.alt \ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.37 -Version: 0.10.37 +%define version_unconverted 0.10.38 +Version: 0.10.38 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -136,11 +136,7 @@ Source: %{pkg_name}-%{version}.tar.gz BuildRequires: %{locale_package} BuildRequires: %{pkg_name} = %{version} BuildRequires: %{use_python}-keyring -%if 0%{?fedora_version} -BuildRequires: %{use_python}-keyrings-alt -%else BuildRequires: %{use_python}-keyrings.alt -%endif BuildRequires: %{use_python}-six BuildRequires: bzr BuildRequires: git-core From af84f0fa6b1aa2b98cebb04bd145deba8d47800011c3d6b3a5e94ff1b9499c6a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 5 Jul 2023 17:02:28 +0000 Subject: [PATCH 5/5] - Update to version 0.10.39: * Add gpg as a dependency (needed for gpg validation) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=328 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.38.tar.gz | 3 --- obs-service-tar_scm-0.10.39.tar.gz | 3 +++ obs-service-tar_scm.changes | 6 ++++++ obs-service-tar_scm.spec | 5 +++-- 7 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.38.tar.gz create mode 100644 obs-service-tar_scm-0.10.39.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 13449af..2c893c1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.38 +pkgver=0.10.39 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index c0b62be..327611b 100644 --- a/_servicedata +++ b/_servicedata @@ -12,6 +12,6 @@ https://github.com/openSUSE/obs-service-tar_scm.git - 96a0e7409c6405f46feab29f8d0e012bb2e84859 + ce886908f2586834a3e8d123ea758ff332bd07c4 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 0e4145d..9b5900e 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.38 +Version: 0.10.39 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm-0.10.38.tar.gz b/obs-service-tar_scm-0.10.38.tar.gz deleted file mode 100644 index 81747fa..0000000 --- a/obs-service-tar_scm-0.10.38.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9a6971bd1ae6650e7d879654f8e371d73edd678a27eda47a5ed13c4f87557bc -size 154856 diff --git a/obs-service-tar_scm-0.10.39.tar.gz b/obs-service-tar_scm-0.10.39.tar.gz new file mode 100644 index 0000000..e3199b5 --- /dev/null +++ b/obs-service-tar_scm-0.10.39.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cadadced6e51ea5a1096aeb2181cbc1b23d92685c3366a5ce79c7728dc5f832b +size 154858 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index c4f5043..2a2471c 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 05 17:01:56 UTC 2023 - dmueller@suse.com + +- Update to version 0.10.39: + * Add gpg as a dependency (needed for gpg validation) + ------------------------------------------------------------------- Wed Jul 05 12:33:14 UTC 2023 - dmueller@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index fe7b488..0da7ffe 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -119,8 +119,8 @@ Recommends: %{use_python}-keyrings.alt \ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.38 -Version: 0.10.38 +%define version_unconverted 0.10.39 +Version: 0.10.39 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -140,6 +140,7 @@ BuildRequires: %{use_python}-keyrings.alt BuildRequires: %{use_python}-six BuildRequires: bzr BuildRequires: git-core +BuildRequires: gpg BuildRequires: mercurial BuildRequires: subversion %if !%{with python3}