Accepting request 801101 from openSUSE:Tools

Incl. multibuild

OBS-URL: https://build.opensuse.org/request/show/801101
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-tar_scm?expand=0&rev=59

PKGBUILD

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

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>test</flavor>
+</multibuild>

_servicedata

@@ -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">d912143a87161e3c306c021f8e122140068a1dc6</param></service></servicedata>
+              <param name="changesrevision">3fd7b0fa6bec9adb01500a59cc5424d34cb1b005</param></service></servicedata>

debian.dsc

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

obs-service-tar_scm-0.10.14.1584463383.06b0455.tar.gz

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

obs-service-tar_scm-0.10.15.1588842879.5c43eef.tar.gz

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

obs-service-tar_scm.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu May 07 09:33:04 UTC 2020 - FSchreiner@suse.com
+
+- Update to version 0.10.15.1588842879.5c43eef:
+  * dist: Convert to multibuild; run test suite in a separate flavor
+
+-------------------------------------------------------------------
+Wed Apr 29 13:48:30 UTC 2020 - FSchreiner@suse.com
+
+- Update to version 0.10.15.1588146746.5cfeeb8:
+  * fix #boo 1168573 (obsservicerun,obsrun) not exists in client side installation
+  * Update debian/changelog for latest version
+  * Helpers: when a command fail, print the command itself too with its output
+  * git: add support for @PARENT_TAG@ in revision
+  * Fix build on non-openSUSE distro
+
 -------------------------------------------------------------------
 Tue Mar 17 16:44:31 UTC 2020 - FSchreiner@suse.com
 

obs-service-tar_scm.spec

@@ -16,12 +16,24 @@
 #
 
 
-%if 0%{?suse_version} && 0%{?suse_version} >= 1220
+%define flavor @BUILD_FLAVOR@%nil
+%if "%{flavor}" == ""
+%define nsuffix %nil
+%else
+%define nsuffix -test
+%endif
+
+%if 0%{?suse_version} && 0%{?suse_version} >= 1220 && "%{flavor}" == "test"
 %bcond_without obs_scm_testsuite
 %else
 %bcond_with    obs_scm_testsuite
 %endif
 
+# special guard for flavor test, yet --without test being specified
+%if "%{flavor}" == "test" && %{without obs_scm_testsuite}
+ExclusiveArch:  skip-build
+%endif
+
 %if 0%{?suse_version} >= 1315 || 0%{?fedora_version} >= 29
 %bcond_without python3
 %else
@@ -84,20 +96,23 @@ Recommends:     bzr                                             \
 Recommends:     mercurial                                       \
 Recommends:     subversion                                      \
 Recommends:     obs-service-download_files                      \
+Recommends:     %{use_python}-keyring                           \
+Recommends:     %{use_python}-keyrings.alt                      \
 %endif                                                          \
 %{nil}
 
 ######## END OF MACROS AND FUN ###################################
 
-Name:           obs-service-tar_scm
+%define pkg_name obs-service-tar_scm
-%define version_unconverted 0.10.14.1584463383.06b0455
+Name:           %{pkg_name}%{nsuffix}
-Version:        0.10.14.1584463383.06b0455
+%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
 Group:          Development/Tools/Building
 URL:            https://github.com/openSUSE/obs-service-tar_scm
-Source:         %{name}-%{version}.tar.gz
+Source:         %{pkg_name}-%{version}.tar.gz
 
 # Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
 # based distributions
@@ -105,6 +120,9 @@ Source:         %{name}-%{version}.tar.gz
 
 %if %{with obs_scm_testsuite}
 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
@@ -124,7 +142,7 @@ BuildRequires:  %{use_python}-dateutil
 BuildRequires:  %{use_python}-lxml
 
 %if %{with python3}
-BuildRequires:  %{use_python}
+BuildRequires:  %{use_python}-base
 # Fix missing Requires in python3-pbr in Leap42.3
 BuildRequires:  %{use_python}-setuptools
 %else
@@ -222,9 +240,10 @@ source artefacts (.dsc, .origin.tar.gz and .debian.tar.gz if non-native).
 %build
 
 %install
+%if %{without obs_scm_testsuite}
 make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}"
 
-%if %{with obs_scm_testsuite}
+%else
 # moved conditional to the top as it helps to have it all in one place and only rely on the bcond_with here.
 %check
 # No need to run PEP8 tests here; that would require a potentially
@@ -233,6 +252,7 @@ make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
 make %{use_test}
 %endif
 
+%if %{without obs_scm_testsuite}
 %files
 %defattr(-,root,root)
 %{_prefix}/lib/obs/service/tar_scm.service
@@ -245,7 +265,7 @@ make %{use_test}
 %{_prefix}/lib/obs/service/tar_scm
 %dir %{_sysconfdir}/obs
 %dir %{_sysconfdir}/obs/services
-%attr(-,obsservicerun,obsrun) %dir %{_sysconfdir}/obs/services/tar_scm.d
+%verify (not user group) %dir %{_sysconfdir}/obs/services/tar_scm.d
 %config(noreplace) %{_sysconfdir}/obs/services/*
 
 %files -n obs-service-tar
@@ -271,5 +291,6 @@ make %{use_test}
 %defattr(-,root,root)
 %{_prefix}/lib/obs/service/obs_gbp*
 %endif
+%endif
 
 %changelog