From dadfbd1e1df73648c8be3d2b7d94b0e9d722710d13bb18186d02af0ea192bc5e Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 9 Sep 2022 09:11:30 +0000 Subject: [PATCH] - Update to version 0.10.32.1662712308.31d1884: * [dist] added Requires to python_path * improve tar service to handle multiple obsinfo files to create tarball from obscpio * new ENV 'TAR_SCM_SKIP_CLEANUP' to make test development/debugging easier * partial clone feature * simplify locking to avoid race conditions * unlink .lock file after unlocking the cache - Update to version 0.10.30.1641993356.a87e7af: * Simplifiy conditions for all rhel like distros * Changed gendered pronoun to be gender neutral OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=311 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- ...-tar_scm-0.10.30.1641990734.bdad8f9.tar.gz | 3 -- ...-tar_scm-0.10.32.1662712308.31d1884.tar.gz | 3 ++ obs-service-tar_scm.changes | 29 +++++++++++++++++++ obs-service-tar_scm.spec | 21 ++++++++------ 7 files changed, 47 insertions(+), 15 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.30.1641990734.bdad8f9.tar.gz create mode 100644 obs-service-tar_scm-0.10.32.1662712308.31d1884.tar.gz diff --git a/PKGBUILD b/PKGBUILD index d9d13fd..0559a2f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.30.1641990734.bdad8f9 +pkgver=0.10.32.1662712308.31d1884 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index b569d15..9fb7131 100644 --- a/_servicedata +++ b/_servicedata @@ -9,4 +9,4 @@ git://github.com/openSUSE/obs-service-tar_scm.git 85bfc3fabb06212b49a389afb3310bfbf2996913 https://github.com/openSUSE/obs-service-tar_scm.git - bdad8f941c0455ea30970aaee53b9e47ba26c93c \ No newline at end of file + 31d1884bdda3cff616826e8780c37389a791b21d \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 778984a..a6e0a30 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.30.1641990734.bdad8f9 +Version: 0.10.32.1662712308.31d1884 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.30.1641990734.bdad8f9.tar.gz b/obs-service-tar_scm-0.10.30.1641990734.bdad8f9.tar.gz deleted file mode 100644 index 5238109..0000000 --- a/obs-service-tar_scm-0.10.30.1641990734.bdad8f9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94062fab13deb58f0f552f4420d7a7aebc5992b0cc05a3dddc1a9b6e57b15de6 -size 91343 diff --git a/obs-service-tar_scm-0.10.32.1662712308.31d1884.tar.gz b/obs-service-tar_scm-0.10.32.1662712308.31d1884.tar.gz new file mode 100644 index 0000000..7119b98 --- /dev/null +++ b/obs-service-tar_scm-0.10.32.1662712308.31d1884.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59106a62a67fb1e25449f520d105eb4867a2835657f63808a3168540da1a05fd +size 92380 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 68331ca..81164ec 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Sep 09 09:09:06 UTC 2022 - FSchreiner@suse.com + +- Update to version 0.10.32.1662712308.31d1884: + * [dist] added Requires to python_path + * improve tar service to handle multiple obsinfo files to create tarball from obscpio + * new ENV 'TAR_SCM_SKIP_CLEANUP' to make test development/debugging easier + * staple pylint version lower than 2.14 because of breaking changes in config + * do not use python mock + * fix pylint errors in commontests.py + * Fixed testing + * use extra cache dir for partial clone + * fix cache update in case of partial clone + * disable partial clone when subdir is set + * do not set default subdir to '.' + * fixes to pass pylint + * enable partial clone feature in git scm + * partial clone feature + * simplify locking to avoid race conditions + * TarSCM.cli: set some defaults to make usage in testing easier + * unlink .lock file after unlocking the cache + +------------------------------------------------------------------- +Thu Jan 13 11:33:51 UTC 2022 - FSchreiner@suse.com + +- Update to version 0.10.30.1641993356.a87e7af: + * Simplifiy conditions for all rhel like distros + * Changed gendered pronoun to be gender neutral + ------------------------------------------------------------------- Wed Jan 12 12:45:18 UTC 2022 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index b39f574..4e7e3e8 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -16,7 +16,7 @@ # -%if 0%{?fedora_version}%{?centos_version}%{?rhel_version}%{?almalinux} +%if 0%{?fedora_version}%{?rhel} %define _pkg_base %nil %else %define _pkg_base -base @@ -40,7 +40,7 @@ ExclusiveArch: skip-build %endif -%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 8 +%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8 %bcond_without python3 %else %bcond_with python3 @@ -71,14 +71,14 @@ ExclusiveArch: skip-build %endif %endif -%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version} || 0%{?almalinux} -%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 +%if 0%{?fedora_version} || 0%{?rhel} +%if 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8 %define pyyaml_package %{use_python}-PyYAML %else %define pyyaml_package PyYAML %endif -%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 +%if 0%{?fedora_version} >= 24 || 0%{?rhel} >= 8 %define locale_package glibc-langpack-en %else %define locale_package glibc-common @@ -92,7 +92,7 @@ ExclusiveArch: skip-build # Mageia 8 has package names python-* # but requires python3 in shebang -%if 0%{?mageia} >= 8 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 8 +%if 0%{?mageia} >= 8 || 0%{?rhel} >= 8 %define python_path %{_bindir}/python3 %else %define python_path %{_bindir}/%{use_python} @@ -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.30.1641990734.bdad8f9 -Version: 0.10.30.1641990734.bdad8f9 +%define version_unconverted 0.10.32.1662712308.31d1884 +Version: 0.10.32.1662712308.31d1884 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -137,13 +137,15 @@ BuildRequires: %{locale_package} BuildRequires: %{pkg_name} = %{version} BuildRequires: %{use_python}-keyring BuildRequires: %{use_python}-keyrings.alt -BuildRequires: %{use_python}-mock BuildRequires: %{use_python}-six BuildRequires: %{use_python}-unittest2 BuildRequires: bzr BuildRequires: git-core BuildRequires: mercurial BuildRequires: subversion +%if !%{with python3} +BuildRequires: %{use_python}-mock +%endif %endif BuildRequires: %{locale_package} @@ -169,6 +171,7 @@ BuildRequires: python >= 2.6 # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +Requires: %{python_path} %description This is a source service for openSUSE Build Service.