- Update to version 0.10.7.1556277536.7e9915a:

* [dist] spec file: python3 only and multidist * Git also uses the LANGUAGE variable * centos_version and rhel_version are triple digits * Minimize diff with the version in openSUSE:Tools * Fix the logic to pick the locale package on Fedora * Forgot the guard 0 in one conditional OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=251
2019-04-26 12:41:15 +00:00 · 2019-04-26 12:41:15 +00:00 · 74753ea83f
commit 74753ea83f
parent 89388efd28
7 changed files with 64 additions and 32 deletions
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 pkgname=obs-service-tar_scm
-pkgver=0.10.6.1551887937.e42c270
+pkgver=0.10.7.1556277536.7e9915a
 pkgrel=0
 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
 arch=('any')
--- a/2
+++ b/2
@ -5,4 +5,4 @@
            <param name="url">git://github.com/M0ses/obs-service-tar_scm.git</param>
          <param name="changesrevision">b742dfc0e12755cf306a95439494b5bdde7c0c61</param></service><service name="tar_scm">
                <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param>
-              <param name="changesrevision">689f06bdad912d238ee2714eeae9f53218953b9a</param></service></servicedata>
+              <param name="changesrevision">77d3c335255671fd6be192d9f8bd941bb166a4c5</param></service></servicedata>
--- a/debian.dsc
+++ b/debian.dsc
@ -1,6 +1,6 @@
 Format: 1.0
 Source: obs-service-tar-scm
-Version: 0.10.6.1551887937.e42c270
+Version: 0.10.7.1556277536.7e9915a
 Provides: obs-service-obs_scm, obs-service-tar
 Binary: obs-service-tar_scm
 Maintainer: Adrian Schroeter <adrian@suse.de>
--- a/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz
+++ b/obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:793ceaa98a3c15ebcd01886275aaec9bb051b914097bfd1ab16ecf773664ee70
-size 67763
--- a/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz
+++ b/obs-service-tar_scm-0.10.7.1556277536.7e9915a.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68b44a46216cd819093e60f31dd3abc7b386758809976d5453e1aab687e7ce53
+size 67532
--- a/obs-service-tar_scm.changes
+++ b/obs-service-tar_scm.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 26 12:40:14 UTC 2019 - FSchreiner@suse.com
+
+- Update to version 0.10.7.1556277536.7e9915a:
+  * [dist] spec file: python3 only and multidist
+  * Git also uses the LANGUAGE variable
+  * centos_version and rhel_version are triple digits
+  * Minimize diff with the version in openSUSE:Tools
+  * Fix the logic to pick the locale package on Fedora
+  * Forgot the guard 0 in one conditional
+
 -------------------------------------------------------------------
 Tue Apr  9 17:18:09 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>

--- a/obs-service-tar_scm.spec
+++ b/obs-service-tar_scm.spec
@ -16,14 +16,31 @@
 #


+%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29
+%bcond_without python3
+%else
+%bcond_with    python3
+%endif
+
+%if %{with python3}
+%define use_python python3
+%define use_test test3
+%else
+%define use_python python
+%define use_test test
+%endif
+
 %if 0%{?suse_version}
+%define pyyaml_package %{use_python}-PyYAML
 %if 0%{?suse_version} >= 1550
 %define locale_package glibc-locale-base
 %else
 %define locale_package glibc-locale
 %endif
 %endif
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?scientificlinux_version}
+%define pyyaml_package PyYAML
 %if 0%{?fedora_version} >= 27 || 0%{?rhel_version} >= 800 || 0%{?centos_version} >= 800
 %define locale_package glibc-langpack-en
 %else
@ -31,45 +48,52 @@
 %endif
 %endif

+%if 0%{?mageia} || 0%{?mandriva_version}
+%define pyyaml_package python-yaml
+%define locale_package locales
+%endif
+
 %bcond_without obs_scm_testsuite

 Name:           obs-service-tar_scm
-%define version_unconverted 0.10.6.1551887937.e42c270
-Version:        0.10.6.1551887937.e42c270
+%define version_unconverted 0.10.7.1556277536.7e9915a
+Version:        0.10.7.1556277536.7e9915a
 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
+
 # Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
 # based distributions
 #Patch0:         0001-Debianization-disable-running-mercurial-tests.patch
+
 %if %{with obs_scm_testsuite}
 BuildRequires:  %{locale_package}
+BuildRequires:  %{use_python}-mock
+BuildRequires:  %{use_python}-six
+BuildRequires:  %{use_python}-unittest2
 BuildRequires:  bzr
 BuildRequires:  git-core
 BuildRequires:  mercurial
 BuildRequires:  subversion
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%endif
+
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mageia} || 0%{?mandriva_version}
 %define py_compile(O)  \
 find %1 -name '*.pyc' -exec rm -f {} \\; \
-python -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+%{use_python} -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
 %{-O: \
 find %1 -name '*.pyo' -exec rm -f {} \\; \
-python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+%{use_python} -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
 }
+%endif
+
+BuildRequires:  %{pyyaml_package}
+BuildRequires:  %{use_python}-dateutil
+BuildRequires:  %{use_python}-lxml

-BuildRequires:  PyYAML
-%else
-BuildRequires:  python-PyYAML
-%endif
-BuildRequires:  python-dateutil
-BuildRequires:  python-lxml
-BuildRequires:  python-mock
-BuildRequires:  python-six
-BuildRequires:  python-unittest2
-%endif
 BuildRequires:  python >= 2.6
 Requires:       git-core

@ -91,14 +115,11 @@ It supports downloading from svn, git, hg and bzr repositories.
 Summary:        Common parts of SCM handling services
 Group:          Development/Tools/Building
 Requires:       %{locale_package}
-Requires:       python-dateutil
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-Requires:       PyYAML
-%else
-Requires:       python-PyYAML
+Requires:       %{pyyaml_package}
+Requires:       %{use_python}-dateutil
+
 %if 0%{?suse_version} < 1315
-Requires:       python-argparse
-%endif
+Requires:       %{use_python}-argparse
 %endif

 %if 0%{?fedora_version} >= 25
@ -113,8 +134,8 @@ Group:          Development/Tools/Building
 Requires:       obs-service-obs_scm-common = %version-%release
 Provides:       obs-service-tar_scm:/usr/lib/obs/service/tar.service
 %if (0%{?fedora_version} && 0%{?fedora_version} < 26) || 0%{?centos} == 6 || 0%{?centos} == 7
-BuildRequires:  python-argparse
-Requires:       python-argparse
+BuildRequires:  %{use_python}-argparse
+Requires:       %{use_python}-argparse
 %endif

 %description -n obs-service-tar
@ -192,7 +213,7 @@ make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
 # No need to run PEP8 tests here; that would require a potentially
 # brittle BuildRequires: python-pep8, and any style issues are already
 # caught by Travis CI.
-make test
+make %{use_test}
 %endif
 %endif