From 4eb4931c2bef1fd45279d2adf0d42196a2c74cd0a52b8de2ceb0dbf96f728b89 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 29 May 2020 11:42:55 +0000 Subject: [PATCH 1/2] - 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 --- PKGBUILD | 2 +- _servicedata | 2 +- debian.dsc | 2 +- ...-tar_scm-0.10.15.1588842879.5c43eef.tar.gz | 3 --- ...-tar_scm-0.10.16.1590752286.5c27247.tar.gz | 3 +++ obs-service-tar_scm.changes | 7 +++++++ obs-service-tar_scm.spec | 19 ++++++++++++++----- 7 files changed, 27 insertions(+), 11 deletions(-) delete mode 100644 obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz create mode 100644 obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8fceb39..dc040eb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.15.1588842879.5c43eef +pkgver=0.10.16.1590752286.5c27247 pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') diff --git a/_servicedata b/_servicedata index d83579b..e549344 100644 --- a/_servicedata +++ b/_servicedata @@ -7,4 +7,4 @@ 9e8b88b088778c44db56781e6a908a0e82e27cf2 git://github.com/openSUSE/obs-service-tar_scm.git - 3fd7b0fa6bec9adb01500a59cc5424d34cb1b005 \ No newline at end of file + 5c2724775d16e61177625a7c0d4a28d9e1c95070 \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index 274d8ee..c5bbaa9 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 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 Binary: obs-service-tar_scm Maintainer: Adrian Schroeter diff --git a/obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz b/obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz deleted file mode 100644 index 8f66fd7..0000000 --- a/obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7be0b0f597632410faf43accab75fb10acd5e5052492f1fff2a34fd2147c9b40 -size 80008 diff --git a/obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz b/obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz new file mode 100644 index 0000000..36996ba --- /dev/null +++ b/obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec277fb618deb9ee2642da4a9de5e31ee2469b2818ebbca7a682a272543d9274 +size 80082 diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index 1cfcf1d..bfe83f0 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -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 diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index 8327df5..e3fa70b 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -16,6 +16,12 @@ # +%if 0%{?fedora} +%define _pkg_base %nil +%else +%define _pkg_base -base +%endif + %define flavor @BUILD_FLAVOR@%nil %if "%{flavor}" == "" %define nsuffix %nil @@ -105,8 +111,8 @@ Recommends: %{use_python}-keyrings.alt \ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.15.1588842879.5c43eef -Version: 0.10.15.1588842879.5c43eef +%define version_unconverted 0.10.16.1590752286.5c27247 +Version: 0.10.16.1590752286.5c27247 Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later @@ -142,7 +148,7 @@ BuildRequires: %{use_python}-dateutil BuildRequires: %{use_python}-lxml %if %{with python3} -BuildRequires: %{use_python}-base +BuildRequires: %{use_python}%{_pkg_base} # Fix missing Requires in python3-pbr in Leap42.3 BuildRequires: %{use_python}-setuptools %else @@ -227,7 +233,9 @@ Summary: Creates Debian source artefacts from a Git repository Group: Development/Tools/Building Requires: git-buildpackage >= 0.6.0 Requires: obs-service-obs_scm-common = %version-%release +%if 0%{?enable_gbp} Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_gbp.service +%endif %description -n obs-service-gbp 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 %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 # 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/services %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 %defattr(-,root,root) From 6c244edf70ce3bb826e9a98eed05d6c0055bd9eb60a7033f698b21212f72c447 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 3 Jun 2020 23:13:04 +0000 Subject: [PATCH 2/2] Accepting request 811138 from home:pgajdos:python - remove unused unittest2 dependency OBS-URL: https://build.opensuse.org/request/show/811138 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=282 --- obs-service-tar_scm.changes | 5 +++++ obs-service-tar_scm.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/obs-service-tar_scm.changes b/obs-service-tar_scm.changes index bfe83f0..dd87586 100644 --- a/obs-service-tar_scm.changes +++ b/obs-service-tar_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 3 12:38:35 UTC 2020 - pgajdos@suse.com + +- remove unused unittest2 dependency + ------------------------------------------------------------------- Fri May 29 11:41:50 UTC 2020 - FSchreiner@suse.com diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec index e3fa70b..67359a3 100644 --- a/obs-service-tar_scm.spec +++ b/obs-service-tar_scm.spec @@ -131,7 +131,6 @@ 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