From ba790afcec70eebed9cd966299a879252e269f5dae2917dc2a374554b4b2411e Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 1 Feb 2021 09:17:50 +0000 Subject: [PATCH 1/2] - Update to version 0.10.20.1606128060.135ac94: * fix build for CentOS adn RHEL 8 * filter dirs with "include" filter option OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=291 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- obs-service-tar_scm.changes | 7 +++++++ obs-service-tar_scm.spec | 13 +++++++------ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 45112e7..83aa93e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.19.1605080719.3b79112 +pkgver=0.10.20.1606128060.135ac94 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 211f7dd..6cbe0c1 100644 --- a/_servicedata +++ b/_servicedata @@ -7,4 +7,4 @@ 9e8b88b088778c44db56781e6a908a0e82e27cf2 git://github.com/openSUSE/obs-service-tar_scm.git - 31d6bb801ce41345daffd30481176c62ef78f3b9 \ No newline at end of file + 135ac94675cc21639b5386d2504eb043098e0ff1 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index b8a49fb..166c99d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.19.1605080719.3b79112 +Version: 0.10.20.1606128060.135ac94 Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 6757af7..78a4183 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 01 09:16:58 UTC 2021 - FSchreiner@suse.com + +- Update to version 0.10.20.1606128060.135ac94: + * fix build for CentOS adn RHEL 8 + * filter dirs with "include" filter option + ------------------------------------------------------------------- Wed Nov 11 07:50:03 UTC 2020 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 3a39cbf..b2aedf2 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -1,7 +1,7 @@ # -# spec file for package obs-service-tar_scm +# spec file for package obs-service-tar_scm-test # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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%{?fedora} +%if 0%{?fedora_version}%{?centos_version}%{?rhel_version} %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 +%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 %bcond_without python3 %else %bcond_with python3 @@ -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.19.1605080719.3b79112 -Version: 0.10.19.1605080719.3b79112 +%define version_unconverted 0.10.20.1606128060.135ac94 +Version: 0.10.20.1606128060.135ac94 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -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 134ae1f35bf8a1597d3c6d0925b0b080d0845bbc23b57077d438f3fb8f5b33dc Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 1 Feb 2021 09:28:02 +0000 Subject: [PATCH 2/2] added missing source tar OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=292 --- obs-service-tar_scm-0.10.19.1605080719.3b79112.tar.gz | 3 --- obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.19.1605080719.3b79112.tar.gz create mode 100644 obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz diff --git a/obs-service-tar_scm-0.10.19.1605080719.3b79112.tar.gz b/obs-service-tar_scm-0.10.19.1605080719.3b79112.tar.gz deleted file mode 100644 index 4ee3d33..0000000 --- a/obs-service-tar_scm-0.10.19.1605080719.3b79112.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72f6df5aa9ae1dfcaeaffda6977178e2f6933cf3d7ea6407921992744121650f -size 231666 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 new file mode 100644 index 0000000..cae7695 --- /dev/null +++ b/obs-service-tar_scm-0.10.20.1606128060.135ac94.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e19e76556538dcb8df524d23514d290cf73acfef0a26bc816fc9bec738120448 +size 231179