From 4d506ed14a5c848f06fbc76c3466f1701c1dd8ca09ca46a7c2c4e18e5d6b60b7 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 21 Jun 2021 07:03:30 +0000 Subject: [PATCH] - Update to version 0.10.26.1624258505.aed4969: * almalinux in spec file * fix include filters for obscpio files * fix python interpreter for mageia 8 * TarScm: use owner/group root in .obscpio files OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=303 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- ...-tar_scm-0.10.26.1623775884.87f49a8.tar.gz | 3 --- ...-tar_scm-0.10.26.1624258505.aed4969.tar.gz | 3 +++ obs-service-tar_scm.changes | 9 +++++++ obs-service-tar_scm.spec | 24 ++++++++++++------- 7 files changed, 31 insertions(+), 14 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.26.1623775884.87f49a8.tar.gz create mode 100644 obs-service-tar_scm-0.10.26.1624258505.aed4969.tar.gz diff --git a/PKGBUILD b/PKGBUILD index f1d3a42..0176b00 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.26.1623775884.87f49a8 +pkgver=0.10.26.1624258505.aed4969 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index 0555c93..8e00ee9 100644 --- a/_servicedata +++ b/_servicedata @@ -7,4 +7,4 @@ 9e8b88b088778c44db56781e6a908a0e82e27cf2 git://github.com/openSUSE/obs-service-tar_scm.git - c7c1213693de8ac641c9802f260df8559467c37f \ No newline at end of file + cd23cf15c118dbed5ac5847a1c7f627718644570 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 3d9bf33..62054c2 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.26.1623775884.87f49a8 +Version: 0.10.26.1624258505.aed4969 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.26.1623775884.87f49a8.tar.gz b/obs-service-tar_scm-0.10.26.1623775884.87f49a8.tar.gz deleted file mode 100644 index 5fd663b..0000000 --- a/obs-service-tar_scm-0.10.26.1623775884.87f49a8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29c518e6a29f6ce48f1b6dd836a1a28de4db04b5c0ea1c8f93118f049ec9f40d -size 88921 diff --git a/obs-service-tar_scm-0.10.26.1624258505.aed4969.tar.gz b/obs-service-tar_scm-0.10.26.1624258505.aed4969.tar.gz new file mode 100644 index 0000000..e811bf6 --- /dev/null +++ b/obs-service-tar_scm-0.10.26.1624258505.aed4969.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0afdce5ad3fef3d653e48369aa61e3ae47a89816d203f16d8c75b7dd479846d +size 89073 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 7507bd1..64bba00 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 21 07:01:03 UTC 2021 - FSchreiner@suse.com + +- Update to version 0.10.26.1624258505.aed4969: + * almalinux in spec file + * fix include filters for obscpio files + * fix python interpreter for mageia 8 + * TarScm: use owner/group root in .obscpio files + ------------------------------------------------------------------- Tue Jun 15 17:02:19 UTC 2021 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 7260705..7af103a 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} +%if 0%{?fedora_version}%{?centos_version}%{?rhel_version}%{?almalinux} %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 +%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?almalinux} >= 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} -%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 +%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 %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 +%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800 || 0%{?almalinux} >= 8 %define locale_package glibc-langpack-en %else %define locale_package glibc-common @@ -90,6 +90,14 @@ ExclusiveArch: skip-build %define locale_package locales %endif +# 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 +%define python_path %{_bindir}/python3 +%else +%define python_path %{_bindir}/%{use_python} +%endif + # avoid code duplication %define scm_common_dep \ Requires: obs-service-obs_scm-common = %version-%release \ @@ -111,8 +119,8 @@ Recommends: %{use_python}-keyrings.alt \ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.26.1623775884.87f49a8 -Version: 0.10.26.1623775884.87f49a8 +%define version_unconverted 0.10.26.1624258505.aed4969 +Version: 0.10.26.1624258505.aed4969 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -249,7 +257,7 @@ source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native). %install %if %{without obs_scm_testsuite} -make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" WITH_GBP="%{enable_gbp}" +make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}" %else