Sync from SUSE:SLFO:Main obs-service-tar_scm revision b0a965c7aaa5a056ccb295818e808a2a

This commit is contained in:
Adrian Schröter 2024-10-03 17:41:53 +02:00
parent bf7a4cea9f
commit 13f2361f92
8 changed files with 106 additions and 29 deletions

View File

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

View File

@ -1,5 +1,5 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="manual">
<param name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param> <param name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
@ -11,10 +11,10 @@
<param name="latest-signed-tag">true</param> <param name="latest-signed-tag">true</param>
<param name="maintainers-asc">_maintainers</param> <param name="maintainers-asc">_maintainers</param>
</service> </service>
<service name="set_version" mode="disabled"> <service name="set_version" mode="manual">
<param name="basename">obs-service-tar_scm</param> <param name="basename">obs-service-tar_scm</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="manual">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">gz</param> <param name="compression">gz</param>
</service> </service>

View File

@ -12,6 +12,6 @@
</service> </service>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param> <param name="url">https://github.com/openSUSE/obs-service-tar_scm.git</param>
<param name="changesrevision">e7c0883fcf4afb987947516640e0505a1d4bed1e</param> <param name="changesrevision">b8058dced0c2422a5905348647edc65baef0efa5</param>
</service> </service>
</servicedata> </servicedata>

View File

@ -1,18 +1,18 @@
Format: 1.0 Format: 1.0
Source: obs-service-tar-scm Source: obs-service-tar-scm
Version: 0.10.41 Version: 0.10.46
Provides: obs-service-obs_scm, obs-service-tar Provides: obs-service-obs_scm, obs-service-tar, obs-service-gbp
Binary: obs-service-tar_scm Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <adrian@suse.de> Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: all Architecture: all
Standards-Version: 3.7.2 Standards-Version: 3.9.3
Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python, python3-yaml Build-Depends: debhelper (>= 8.0.0), python3, python3-dateutil, dh-python, python3-yaml
Package: obs-service-tar-scm Package: obs-service-tar-scm
Architecture: all Architecture: all
Provides: obs-service-obs-scm, obs-service-tar Provides: obs-service-obs-scm, obs-service-tar
Depends: ${misc:Depends}, ${python3:Depends}, bzr, git, subversion, cpio, python3-dateutil, python3-yaml Depends: ${misc:Depends}, ${python3:Depends}, python3, bzr, git, subversion, cpio, python3-dateutil, python3-yaml
Recommends: mercurial Recommends: mercurial, git-buildpackage, git-lfs
Description: An OBS source service: fetches SCM tarballs Description: An OBS source service: fetches SCM tarballs
This is a source service for openSUSE Build Service. This is a source service for openSUSE Build Service.
It supports downloading from svn, git, hg and bzr repositories. It supports downloading from svn, git, hg and bzr repositories.

BIN
obs-service-tar_scm-0.10.41.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
obs-service-tar_scm-0.10.46.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,73 @@
-------------------------------------------------------------------
Thu Aug 01 12:57:19 UTC 2024 - adrian@suse.de
- Update to version 0.10.46:
* [dist] fix BuildRequires for older distros like SLE12
-------------------------------------------------------------------
Thu Aug 01 09:48:25 UTC 2024 - adrian@suse.de
- Update to version 0.10.45:
* [dist] fix shebang substitution in spec for py2
-------------------------------------------------------------------
Wed Jul 31 09:20:54 UTC 2024 - adrian@suse.de
- Update to version 0.10.44:
* import submit request change
* Support updating submodules to main branch
* do not skip "--reference" if package-meta ...
* cpio: Do not follow symlinks in 'touch'
* Support URL hostname in keyring
* gbp: use --git-export
* Update debian/changelog for 0.10.43
* disable compile python in debian package
* update dist/debian.dsc to match debian packaging
* Update debian debhelper dependency
* Fix description-synopsis-starts-with-article
* Fix priority-extra-is-replaced-by-priority-optional
* Debian compat from 8 to 10
* Debian X-Python version no longer needed
* Fix Lintian error about missing python3 dep
* enable the GBP service
* Fixed filtering of include/exclude when topdir has escape characters.
* Fix setting svn credentials in the command line
-------------------------------------------------------------------
Wed Jul 31 09:06:24 UTC 2024 - Adrian Schröter <adrian@suse.de>
- update to version 0.10.44:
* Support updating submodules to main branch
* Debian packaging for gbp service
* do not skip "--reference" if package-meta is enabled and git's partial clone is used.
* Fixed filtering of include/exclude when topdir has escape characters.
* Fix setting svn credentials in the command line
* cpio: Do not follow symlinks in 'touch'
* Support URL hostname in keyring
* debian package updates
-------------------------------------------------------------------
Thu Jul 25 19:52:48 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- "Downgrade" bzr, mercurial and subversion Recommends to Suggests.
-------------------------------------------------------------------
Fri Jun 14 18:33:15 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Fix shebang of the script to use the explicit version of Python
(bsc#1212476).
-------------------------------------------------------------------
Wed Feb 21 10:47:59 UTC 2024 - Adrian Schröter <adrian@suse.de>
- Update to version 0.10.43:
* Allow to use "tar" service also standalone.
-------------------------------------------------------------------
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
@ -342,7 +412,7 @@ Tue Jun 04 11:42:50 UTC 2019 - FSchreiner@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 8 13:26:40 UTC 2019 - Julio González Gil <jgonzalez@suse.com> Wed May 8 13:26:40 UTC 2019 - Julio González Gil <jgonzalez@suse.com>
- Require external argparse for RHEL6 - Require external argparse for RHEL6
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 07 22:41:38 UTC 2019 - FSchreiner@suse.com Tue May 07 22:41:38 UTC 2019 - FSchreiner@suse.com
@ -699,7 +769,7 @@ Wed Jun 7 08:53:48 UTC 2017 - adrian@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 11 11:49:37 UTC 2017 - marco.strigl@suse.com Thu May 11 11:49:37 UTC 2017 - marco.strigl@suse.com
- added Requires: python2 for Fedora >= 25 - added Requires: python2 for Fedora >= 25
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 18 07:17:45 UTC 2017 - fvogt@suse.com Tue Apr 18 07:17:45 UTC 2017 - fvogt@suse.com
@ -866,7 +936,7 @@ Sun Oct 30 20:48:49 UTC 2016 - opensuse-packaging@opensuse.org
Sun Oct 30 20:45:47 UTC 2016 - opensuse-packaging@opensuse.org Sun Oct 30 20:45:47 UTC 2016 - opensuse-packaging@opensuse.org
- Update to version 0.7.0.1474270818.3e05f80: - Update to version 0.7.0.1474270818.3e05f80:
* *
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 27 11:23:36 UTC 2016 - opensuse-packaging@opensuse.org Thu Oct 27 11:23:36 UTC 2016 - opensuse-packaging@opensuse.org
@ -1378,13 +1448,13 @@ Tue Jul 3 11:23:12 UTC 2012 - adrian@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jun 30 13:56:51 UTC 2012 - magist3r@gmail.com Sat Jun 30 13:56:51 UTC 2012 - magist3r@gmail.com
- Fixed error with cache - Fixed error with cache
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jun 30 10:59:34 UTC 2012 - magist3r@gmail.com Sat Jun 30 10:59:34 UTC 2012 - magist3r@gmail.com
- Added an option to disable git submodules - Added an option to disable git submodules
- Replaced --exclude=.$MYSCM with --exclude-vcs tar option - Replaced --exclude=.$MYSCM with --exclude-vcs tar option
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 28 22:53:29 UTC 2012 - magist3r@gmail.com Thu Jun 28 22:53:29 UTC 2012 - magist3r@gmail.com
@ -1396,8 +1466,8 @@ Tue Jun 5 11:12:07 UTC 2012 - saschpe@suse.de
- Re-iterating the last change once again, 'git rev-parse --verify $REV' - Re-iterating the last change once again, 'git rev-parse --verify $REV'
will return false even if $REV is a normal branch upon first clone will return false even if $REV is a normal branch upon first clone
of the repo. Thus 'git fetch $URL +$REV:$REV" is run initially. of the repo. Thus 'git fetch $URL +$REV:$REV" is run initially.
However, the 'git checkout $REV' then fails because it's missing However, the 'git checkout $REV' then fails because it's missing
tracking information. Therefore, try a normal checkout first and fetch tracking information. Therefore, try a normal checkout first and fetch
the specific $REV only when that fails (due to reasons described below). the specific $REV only when that fails (due to reasons described below).
@ -1519,7 +1589,7 @@ Fri Aug 12 11:51:07 UTC 2011 - adrian@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 20 08:48:12 UTC 2011 - cthiel@novell.com Mon Jun 20 08:48:12 UTC 2011 - cthiel@novell.com
- add support for bzr - add support for bzr
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 22 14:55:55 UTC 2011 - ammler@openttdcoop.org Tue Mar 22 14:55:55 UTC 2011 - ammler@openttdcoop.org

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file for package obs-service-tar_scm
# #
# 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
@ -106,12 +106,12 @@ Requires: obs-service-obs_scm-common = %version-%release \
%define scm_dependencies \ %define scm_dependencies \
Requires: git-core \ Requires: git-core \
%if 0%{?suse_version} >= 1315 \ %if 0%{?suse_version} >= 1315 \
Recommends: bzr \
Recommends: mercurial \
Recommends: subversion \
Recommends: obs-service-download_files \ Recommends: obs-service-download_files \
Recommends: %{use_python}-keyring \ Recommends: %{use_python}-keyring \
Recommends: %{use_python}-keyrings.alt \ Recommends: %{use_python}-keyrings.alt \
Suggests: bzr \
Suggests: mercurial \
Suggests: subversion \
%endif \ %endif \
%{nil} %{nil}
@ -119,8 +119,8 @@ Recommends: %{use_python}-keyrings.alt \
%define pkg_name obs-service-tar_scm %define pkg_name obs-service-tar_scm
Name: %{pkg_name}%{nsuffix} Name: %{pkg_name}%{nsuffix}
%define version_unconverted 0.10.41 %define version_unconverted 0.10.46
Version: 0.10.41 Version: 0.10.46
Release: 0 Release: 0
Summary: An OBS source service: create tar ball from svn/git/hg Summary: An OBS source service: create tar ball from svn/git/hg
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -161,6 +161,9 @@ BuildRequires: %{use_python}-lxml
BuildRequires: %{use_python}%{_pkg_base} BuildRequires: %{use_python}%{_pkg_base}
# Fix missing Requires in python3-pbr in Leap42.3 # Fix missing Requires in python3-pbr in Leap42.3
BuildRequires: %{use_python}-setuptools BuildRequires: %{use_python}-setuptools
%if 0%{?suse_version}
BuildRequires: python-rpm-macros
%endif
%else %else
BuildRequires: python >= 2.6 BuildRequires: python >= 2.6
%endif %endif
@ -261,7 +264,11 @@ source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native).
%install %install
%if %{without obs_scm_testsuite} %if %{without obs_scm_testsuite}
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}" make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{python_path}" WITH_GBP="%{enable_gbp}"
%if %{with python3}
# Doing %%python3_fix_shebang_path old fashioned way for the backward compatibility
sed -i "1s@#\\!.*python\S*@#\\!$(realpath %__python3)@" \
%{buildroot}%{_prefix}/lib/obs/service/tar_scm
%endif
%else %else
# moved conditional to the top as it helps to have it all in one place and only rely on the bcond_with here. # moved conditional to the top as it helps to have it all in one place and only rely on the bcond_with here.