Adrian Schröter 2023-05-19 12:50:06 +00:00 committed by Git OBS Bridge
parent b14fb8c1a0
commit f3635d8a31
7 changed files with 19 additions and 21 deletions

View File

@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
pkgver=0.10.34.1667392550.026bf0e
pkgver=0.10.35
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')

View File

@ -3,14 +3,15 @@
<param name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
<param name="versionformat">@PARENT_TAG@.%ct.%h</param>
<param name="version">0.10.35</param>
<param name="changesgenerate">enable</param>
<param name="extract">dist/obs-service-tar_scm.spec</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="revision">master</param>
<param name="revision">0.10.35</param>
<param name="latest-signed-tag">true</param>
<!--
<param name="maintainers-asc">_maintainers</param>
-->
</service>
<service name="set_version" mode="disabled">
<param name="basename">obs-service-tar_scm</param>

View File

@ -9,4 +9,4 @@
<param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
<param name="changesrevision">85bfc3fabb06212b49a389afb3310bfbf2996913</param></service><service name="tar_scm">
<param name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
<param name="changesrevision">026bf0e08d904f092e7dbdb893bd204efc7f59c9</param></service></servicedata>
<param name="changesrevision">85bfc3fabb06212b49a389afb3310bfbf2996913</param></service></servicedata>

View File

@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
Version: 0.10.34.1667392550.026bf0e
Version: 0.10.35
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <adrian@suse.de>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5ae8a33e2bf302ceabd7f5cf126a52c116250dcee2dd8169d062fc20bf337f1
size 156812

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee80f7fd183b809646a2aef9b759917952ee040b0a4f6939f753ccf87de77e8d
size 90896

View File

@ -16,7 +16,7 @@
#
%if 0%{?fedora_version}%{?rhel}
%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%{?rhel} >= 8
%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}
%if 0%{?fedora_version} >= 29 || 0%{?rhel} >= 8
%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} >= 8
%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
@ -92,7 +92,7 @@ ExclusiveArch: skip-build
# Mageia 8 has package names python-*
# but requires python3 in shebang
%if 0%{?mageia} >= 8 || 0%{?rhel} >= 8
%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}
@ -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.34.1667392550.026bf0e
Version: 0.10.34.1667392550.026bf0e
%define version_unconverted 0.10.35
Version: 0.10.35
Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later
@ -137,15 +137,13 @@ 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}
@ -171,7 +169,6 @@ BuildRequires: python >= 2.6
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: %{python_path}
%description
This is a source service for openSUSE Build Service.