- Update to version 0.10.16.1590752286.5c27247:
* [dist] fix for gbp/fedora (python*-base) * fix situation when revision has been modified in _service OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=281
This commit is contained in:
parent
d69bca7a84
commit
4eb4931c2b
2
PKGBUILD
2
PKGBUILD
@ -1,5 +1,5 @@
|
|||||||
pkgname=obs-service-tar_scm
|
pkgname=obs-service-tar_scm
|
||||||
pkgver=0.10.15.1588842879.5c43eef
|
pkgver=0.10.16.1590752286.5c27247
|
||||||
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')
|
||||||
|
@ -7,4 +7,4 @@
|
|||||||
<param name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service>
|
<param name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service>
|
||||||
<service name="tar_scm">
|
<service name="tar_scm">
|
||||||
<param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
|
<param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
|
||||||
<param name="changesrevision">3fd7b0fa6bec9adb01500a59cc5424d34cb1b005</param></service></servicedata>
|
<param name="changesrevision">5c2724775d16e61177625a7c0d4a28d9e1c95070</param></service></servicedata>
|
@ -1,6 +1,6 @@
|
|||||||
Format: 1.0
|
Format: 1.0
|
||||||
Source: obs-service-tar-scm
|
Source: obs-service-tar-scm
|
||||||
Version: 0.10.15.1588842879.5c43eef
|
Version: 0.10.16.1590752286.5c27247
|
||||||
Provides: obs-service-obs_scm, obs-service-tar
|
Provides: obs-service-obs_scm, obs-service-tar
|
||||||
Binary: obs-service-tar_scm
|
Binary: obs-service-tar_scm
|
||||||
Maintainer: Adrian Schroeter <adrian@suse.de>
|
Maintainer: Adrian Schroeter <adrian@suse.de>
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7be0b0f597632410faf43accab75fb10acd5e5052492f1fff2a34fd2147c9b40
|
|
||||||
size 80008
|
|
3
obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz
Normal file
3
obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ec277fb618deb9ee2642da4a9de5e31ee2469b2818ebbca7a682a272543d9274
|
||||||
|
size 80082
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 29 11:41:50 UTC 2020 - FSchreiner@suse.com
|
||||||
|
|
||||||
|
- Update to version 0.10.16.1590752286.5c27247:
|
||||||
|
* [dist] fix for gbp/fedora (python*-base)
|
||||||
|
* fix situation when revision has been modified in _service
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 07 09:33:04 UTC 2020 - FSchreiner@suse.com
|
Thu May 07 09:33:04 UTC 2020 - FSchreiner@suse.com
|
||||||
|
|
||||||
|
@ -16,6 +16,12 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%define _pkg_base %nil
|
||||||
|
%else
|
||||||
|
%define _pkg_base -base
|
||||||
|
%endif
|
||||||
|
|
||||||
%define flavor @BUILD_FLAVOR@%nil
|
%define flavor @BUILD_FLAVOR@%nil
|
||||||
%if "%{flavor}" == ""
|
%if "%{flavor}" == ""
|
||||||
%define nsuffix %nil
|
%define nsuffix %nil
|
||||||
@ -105,8 +111,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.15.1588842879.5c43eef
|
%define version_unconverted 0.10.16.1590752286.5c27247
|
||||||
Version: 0.10.15.1588842879.5c43eef
|
Version: 0.10.16.1590752286.5c27247
|
||||||
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
|
||||||
@ -142,7 +148,7 @@ BuildRequires: %{use_python}-dateutil
|
|||||||
BuildRequires: %{use_python}-lxml
|
BuildRequires: %{use_python}-lxml
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
BuildRequires: %{use_python}-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
|
||||||
%else
|
%else
|
||||||
@ -227,7 +233,9 @@ Summary: Creates Debian source artefacts from a Git repository
|
|||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
Requires: git-buildpackage >= 0.6.0
|
Requires: git-buildpackage >= 0.6.0
|
||||||
Requires: obs-service-obs_scm-common = %version-%release
|
Requires: obs-service-obs_scm-common = %version-%release
|
||||||
|
%if 0%{?enable_gbp}
|
||||||
Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_gbp.service
|
Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_gbp.service
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n obs-service-gbp
|
%description -n obs-service-gbp
|
||||||
Debian git-buildpackage workflow support: uses gbp to create Debian
|
Debian git-buildpackage workflow support: uses gbp to create Debian
|
||||||
@ -241,7 +249,7 @@ 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="%{_bindir}/%{use_python}"
|
make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}" WITH_GBP="%{enable_gbp}"
|
||||||
|
|
||||||
%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.
|
||||||
@ -266,7 +274,8 @@ make %{use_test}
|
|||||||
%dir %{_sysconfdir}/obs
|
%dir %{_sysconfdir}/obs
|
||||||
%dir %{_sysconfdir}/obs/services
|
%dir %{_sysconfdir}/obs/services
|
||||||
%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
|
%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
|
||||||
%config(noreplace) %{_sysconfdir}/obs/services/*
|
%config(noreplace) %{_sysconfdir}/obs/services/
|
||||||
|
%ghost %dir %{_sysconfdir}/obs/services/tar_scm.d/python_keyring
|
||||||
|
|
||||||
%files -n obs-service-tar
|
%files -n obs-service-tar
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user