Accepting request 1139481 from home:dirkmueller:AL:TW:Fixups

- add support for AL2023

- Require external argparse for RHEL6
- added Requires: python2 for Fedora >= 25
  *
- Fixed error with cache
- Replaced --exclude=.$MYSCM with --exclude-vcs tar option
  of the repo. Thus 'git fetch $URL +$REV:$REV" is run initially.
  However, the 'git checkout $REV' then fails because it's missing
- add support for bzr

OBS-URL: https://build.opensuse.org/request/show/1139481
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=335
This commit is contained in:
Dirk Mueller 2024-01-22 07:55:57 +00:00 committed by Git OBS Bridge
parent 7dc3974a2e
commit 5b839b2541
3 changed files with 20 additions and 15 deletions

View File

@ -7,7 +7,7 @@ url="https://github.com/openSUSE/obs-service-tar_scm"
license=('GPL3') license=('GPL3')
groups=('base-devel') groups=('base-devel')
makedepends=('python' 'python-yaml' 'python-dateutil' 'python-lxml' 'python-mock' 'bzr' 'git' 'mercurial' 'subversion' ) makedepends=('python' 'python-yaml' 'python-dateutil' 'python-lxml' 'python-mock' 'bzr' 'git' 'mercurial' 'subversion' )
depends=('python' 'python-yaml' 'python-dateutil' 'cpio' 'git' 'bzr' 'mercurial' 'subversion' ) depends=('python' 'python-yaml' 'python-dateutil' 'python-argparse' 'cpio' 'git' 'bzr' 'mercurial' 'subversion' )
source=("obs-service-tar_scm-${pkgver}.tar.gz") source=("obs-service-tar_scm-${pkgver}.tar.gz")
noextract=("obs-service-tar_scm-${pkgver}.tar.gz") noextract=("obs-service-tar_scm-${pkgver}.tar.gz")
provides=('obs-service-tar') provides=('obs-service-tar')

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 17 14:42:51 UTC 2024 - Dirk Müller <dmueller@suse.com>
- add support for AL2023
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 20 14:36:05 UTC 2023 - FSchreiner@suse.com Thu Jul 20 14:36:05 UTC 2023 - FSchreiner@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
# #
%if 0%{?fedora_version}%{?rhel} %if 0%{?fedora_version}%{?rhel}%{?amzn}
%define _pkg_base %nil %define _pkg_base %nil
%else %else
%define _pkg_base -base %define _pkg_base -base
@ -40,7 +40,7 @@
ExclusiveArch: skip-build ExclusiveArch: skip-build
%endif %endif
%if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8 %if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8 || 0%{?amzn}
%bcond_without python3 %bcond_without python3
%else %else
%bcond_with python3 %bcond_with python3
@ -71,14 +71,14 @@ ExclusiveArch: skip-build
%endif %endif
%endif %endif
%if 0%{?fedora_version} || 0%{?rhel} %if 0%{?fedora_version} || 0%{?rhel} || 0%{?amzn}
%if 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8 %if 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8 || 0%{?amzn}
%define pyyaml_package %{use_python}-PyYAML %define pyyaml_package %{use_python}-PyYAML
%else %else
%define pyyaml_package PyYAML %define pyyaml_package PyYAML
%endif %endif
%if 0%{?fedora_version} >= 24 || 0%{?rhel} >= 8 %if 0%{?fedora_version} >= 24 || 0%{?rhel} >= 8 || 0%{?amzn}
%define locale_package glibc-langpack-en %define locale_package glibc-langpack-en
%else %else
%define locale_package glibc-common %define locale_package glibc-common