Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2020-06-08 23:43:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Mon Jun 8 23:43:31 2020 rev:60 rq:811252 version:0.10.16.1590752286.5c27247
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2020-05-09 19:52:18.796832586 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.3606/obs-service-tar_scm.changes
2020-06-08 23:43:33.953278197 +0200
@@ -1,0 +2,12 @@
+Wed Jun 3 12:38:35 UTC 2020 - [email protected]
+
+- remove unused unittest2 dependency
+
+-------------------------------------------------------------------
+Fri May 29 11:41:50 UTC 2020 - [email protected]
+
+- Update to version 0.10.16.1590752286.5c27247:
+ * [dist] fix for gbp/fedora (python*-base)
+ * fix situation when revision has been modified in _service
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz
New:
----
obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.C6fvOw/_old 2020-06-08 23:43:34.549280035 +0200
+++ /var/tmp/diff_new_pack.C6fvOw/_new 2020-06-08 23:43:34.553280047 +0200
@@ -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 @@
%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
@@ -125,7 +131,6 @@
BuildRequires: %{use_python}-keyrings.alt
BuildRequires: %{use_python}-mock
BuildRequires: %{use_python}-six
-BuildRequires: %{use_python}-unittest2
BuildRequires: bzr
BuildRequires: git-core
BuildRequires: mercurial
@@ -142,7 +147,7 @@
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 +232,9 @@
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 +248,7 @@
%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 +273,8 @@
%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)
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.C6fvOw/_old 2020-06-08 23:43:34.581280134 +0200
+++ /var/tmp/diff_new_pack.C6fvOw/_new 2020-06-08 23:43:34.581280134 +0200
@@ -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')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.C6fvOw/_old 2020-06-08 23:43:34.621280257 +0200
+++ /var/tmp/diff_new_pack.C6fvOw/_new 2020-06-08 23:43:34.621280257 +0200
@@ -7,4 +7,4 @@
<param
name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
- <param
name="changesrevision">3fd7b0fa6bec9adb01500a59cc5424d34cb1b005</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">5c2724775d16e61177625a7c0d4a28d9e1c95070</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.C6fvOw/_old 2020-06-08 23:43:34.637280307 +0200
+++ /var/tmp/diff_new_pack.C6fvOw/_new 2020-06-08 23:43:34.637280307 +0200
@@ -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 <[email protected]>
++++++ obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz ->
obs-service-tar_scm-0.10.16.1590752286.5c27247.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.15.1588842879.5c43eef/TarSCM/scm/git.py
new/obs-service-tar_scm-0.10.16.1590752286.5c27247/TarSCM/scm/git.py
--- old/obs-service-tar_scm-0.10.15.1588842879.5c43eef/TarSCM/scm/git.py
2020-05-07 11:14:39.000000000 +0200
+++ new/obs-service-tar_scm-0.10.16.1590752286.5c27247/TarSCM/scm/git.py
2020-05-29 13:38:06.000000000 +0200
@@ -59,11 +59,19 @@
cwd=self.clone_dir)[1]
# merge may fail when not a remote branch, that is fine
- self.helpers.run_cmd(
+ rcode, output = self.helpers.run_cmd(
self._get_scm_cmd() + ['merge', 'origin/' + self.revision],
cwd=self.clone_dir,
interactive=True)
+ # we must test also merge a possible local tag/branch
+ # because the user may have changed the revision in _service file
+ if rcode != 0 and 'not something we can merge' in output:
+ self.helpers.run_cmd(
+ self._get_scm_cmd() + ['merge', self.revision],
+ cwd=self.clone_dir,
+ interactive=True)
+
# validate the existens of the revision
if self.revision and not self._ref_exists(self.revision):
sys.exit('%s: No such revision' % self.revision)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.15.1588842879.5c43eef/dist/obs-service-tar_scm.spec
new/obs-service-tar_scm-0.10.16.1590752286.5c27247/dist/obs-service-tar_scm.spec
---
old/obs-service-tar_scm-0.10.15.1588842879.5c43eef/dist/obs-service-tar_scm.spec
2020-05-07 11:14:39.000000000 +0200
+++
new/obs-service-tar_scm-0.10.16.1590752286.5c27247/dist/obs-service-tar_scm.spec
2020-05-29 13:38:06.000000000 +0200
@@ -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 @@
%define pkg_name obs-service-tar_scm
Name: %{pkg_name}%{nsuffix}
-%define version_unconverted 0.10.15.1588146746.5cfeeb8
-Version: 0.10.15.1588146746.5cfeeb8
+%define version_unconverted 0.10.15.1588842879.5c43eef
+Version: 0.10.15.1588842879.5c43eef
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}-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 @@
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 @@
%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 @@
%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)
