From f3c5f849ed5a7fdef8c9f57baa23e765a1210611c9305e4c344b76bc5bf313aa Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 10 Feb 2021 08:43:50 +0000 Subject: [PATCH 1/4] - Update to version 0.10.21.1612422695.2fdf897: * activate pylint3.8 and fixed false positives * don`t sanitize version if versionrewrite_pattern is set OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=293 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz | 3 --- obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz | 3 +++ obs-service-tar_scm.changes | 7 +++++++ obs-service-tar_scm.spec | 7 +++---- 7 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz create mode 100644 obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 83aa93e..2eef0db 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.20.1606128060.135ac94 +pkgver=0.10.21.1612422695.2fdf897 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 6cbe0c1..9c55934 100644 --- a/_servicedata +++ b/_servicedata @@ -7,4 +7,4 @@ 9e8b88b088778c44db56781e6a908a0e82e27cf2 git://github.com/openSUSE/obs-service-tar_scm.git - 135ac94675cc21639b5386d2504eb043098e0ff1 \ No newline at end of file + 24d0fc541e3ba769d3aae098d3952dea275b59af \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 166c99d..cd1ebe6 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.20.1606128060.135ac94 +Version: 0.10.21.1612422695.2fdf897 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.20.1606128060.135ac94.tar.gz b/obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz deleted file mode 100644 index cae7695..0000000 --- a/obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e19e76556538dcb8df524d23514d290cf73acfef0a26bc816fc9bec738120448 -size 231179 diff --git a/obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz b/obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz new file mode 100644 index 0000000..c15d4dc --- /dev/null +++ b/obs-service-tar_scm-0.10.21.1612422695.2fdf897.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8921d02a3f8b1afdcaa661fa0446f2d15700569709aa418a00cc681a1edc2111 +size 232013 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 78a4183..b8eaf38 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 10 07:47:00 UTC 2021 - FSchreiner@suse.com + +- Update to version 0.10.21.1612422695.2fdf897: + * activate pylint3.8 and fixed false positives + * don`t sanitize version if versionrewrite_pattern is set + ------------------------------------------------------------------- Mon Feb 01 09:16:58 UTC 2021 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index b2aedf2..e1a0b2c 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -1,5 +1,5 @@ # -# spec file for package obs-service-tar_scm-test +# spec file for package obs-service-tar_scm # # Copyright (c) 2021 SUSE LLC # @@ -111,8 +111,8 @@ Recommends: %{use_python}-keyrings.alt \ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.20.1606128060.135ac94 -Version: 0.10.20.1606128060.135ac94 +%define version_unconverted 0.10.21.1612422695.2fdf897 +Version: 0.10.21.1612422695.2fdf897 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -252,7 +252,6 @@ source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native). make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" WITH_GBP="%{enable_gbp}" %else - # moved conditional to the top as it helps to have it all in one place and only rely on the bcond_with here. %check # No need to run PEP8 tests here; that would require a potentially From 587384b802df896925e25ec48b631d6ec7713db3a678d2d8e1f76c88e3acb6e2 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 15 Feb 2021 07:49:38 +0000 Subject: [PATCH 2/4] * fixes boo#1127353 * fixes boo#1168573 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=295 --- obs-service-tar_scm.changes | 2 ++ obs-service-tar_scm.spec | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index b8eaf38..c7c3159 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -2,6 +2,8 @@ Wed Feb 10 07:47:00 UTC 2021 - FSchreiner@suse.com - Update to version 0.10.21.1612422695.2fdf897: + * fixes boo#1127353 + * fixes boo#1168573 * activate pylint3.8 and fixed false positives * don`t sanitize version if versionrewrite_pattern is set diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index e1a0b2c..4bb6aea 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -1,5 +1,5 @@ # -# spec file for package obs-service-tar_scm +# spec file for package obs-service-tar_scm-test # # Copyright (c) 2021 SUSE LLC # @@ -252,6 +252,7 @@ source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native). make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" WITH_GBP="%{enable_gbp}" %else + # moved conditional to the top as it helps to have it all in one place and only rely on the bcond_with here. %check # No need to run PEP8 tests here; that would require a potentially From 3a74988c982cd69f3b2f8d80d60c55009c35dcdcaea04a8cfbc8475fff19d776 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 15 Feb 2021 08:25:36 +0000 Subject: [PATCH 3/4] sync changelog for SLE12/SLE15/Leap15 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=296 --- obs-service-tar_scm.changes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index c7c3159..3411173 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -145,8 +145,25 @@ Thu Aug 22 11:25:57 UTC 2019 - FSchreiner@suse.com ------------------------------------------------------------------- Wed Jun 05 14:47:42 UTC 2019 - FSchreiner@suse.com +- Fixes boo#1138377 - Update to version 0.10.9.1559745964.22c86cd: * [dist] python3 for SLE12 and openSUSE 42.3 + * [dist] enable python3 in SLE >= 12 + * fix encoding error for surrogates + * glibc-common was used up to FC23 and RHEL7 + * Compile python files before install + * change order in GNUMakefile to prefer python3 + * More thorought spec file cleanup + * predefine python version in spec file for GNUMAkefile + * [dist] spec file: python3 only and multidist + * Git also uses the LANGUAGE variable + * centos_version and rhel_version are triple digits + * Minimize diff with the version in openSUSE:Tools + * Fix the logic to pick the locale package on Fedora + * Forgot the guard 0 in one conditional + * Require packages to get the en_US.UTF-8 locales + * enforce bytes for cpio file list + ------------------------------------------------------------------- Tue Jun 04 11:42:50 UTC 2019 - FSchreiner@suse.com From 936bb9f00908b749c76858fd832d3063d744e1cfdf7dc865ffa0acbe9064f9a9 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 15 Feb 2021 09:01:20 +0000 Subject: [PATCH 4/4] fix spec header OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=297 --- obs-service-tar_scm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 4bb6aea..8151f41 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -1,5 +1,5 @@ # -# spec file for package obs-service-tar_scm-test +# spec file for package obs-service-tar_scm # # Copyright (c) 2021 SUSE LLC #