Hello community,
here is the log from the commit of package obs-service-tar_scm for
openSUSE:Factory checked in at 2019-05-28 09:40:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old)
and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-tar_scm"
Tue May 28 09:40:05 2019 rev:53 rq:705415 version:0.10.9.1557261720.32a1cdb
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes
2019-03-14 14:53:15.827780052 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.5148/obs-service-tar_scm.changes
2019-05-28 09:40:10.285907532 +0200
@@ -1,0 +2,57 @@
+Wed May 8 13:26:40 UTC 2019 - Julio González Gil <[email protected]>
+
+- Require external argparse for RHEL6
+
+-------------------------------------------------------------------
+Tue May 07 22:41:38 UTC 2019 - [email protected]
+
+- Update to version 0.10.9.1557261720.32a1cdb:
+ * fix encoding error for surrogates
+ * glibc-common was used up to FC23 and RHEL7
+
+-------------------------------------------------------------------
+Fri May 03 15:24:40 UTC 2019 - [email protected]
+
+- Update to version 0.10.8.1556896538.0693a62:
+ * Compile python files before install
+ * change order in GNUMakefile to prefer python3
+ * More thorought spec file cleanup
+ * predefine python version in spec file for GNUMAkefile
+
+-------------------------------------------------------------------
+Fri Apr 26 19:00:00 UTC 2019 - Marcus Rueckert <[email protected]>
+
+- the current guessing code is finding python2 and then uses that,
+ because python2 still seems to be available in the build env,
+ as we already know which python version we want we can just pass
+ the path to make and skip the whole guessing.
+
+-------------------------------------------------------------------
+Fri Apr 26 12:40:14 UTC 2019 - [email protected]
+
+- 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 <[email protected]>
+
+- centos_version and rhel_version are triple digits
+
+-------------------------------------------------------------------
+Tue Apr 9 17:03:08 UTC 2019 - Marcus Rueckert <[email protected]>
+
+- locally apply fixes from
+ https://github.com/openSUSE/obs-service-tar_scm/pull/298
+
+-------------------------------------------------------------------
+Fri Mar 29 13:49:15 UTC 2019 - Julio González Gil <[email protected]>
+
+- Change requirement locale_package to glibc-common to fix building
+ for CentOS6 and CentOS7
+
+-------------------------------------------------------------------
Old:
----
obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz
New:
----
obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-tar_scm.spec ++++++
--- /var/tmp/diff_new_pack.4KcJgf/_old 2019-05-28 09:40:11.465907143 +0200
+++ /var/tmp/diff_new_pack.4KcJgf/_new 2019-05-28 09:40:11.469907142 +0200
@@ -16,65 +16,123 @@
#
+%if 0%{?suse_version} && 0%{?suse_version} >= 1220
+%bcond_without obs_scm_testsuite
+%else
+%bcond_with obs_scm_testsuite
+%endif
+
+%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+# This list probably needs to be extended
+# logic seems to be if python < 2.7 ; then needs_external_argparse ; fi
+%if (0%{?centos_version} == 6) || (0%{?rhel_version} == 600) ||
(0%{?suse_version} && 0%{?suse_version} < 1315) || (0%{?fedora_version} &&
0%{?fedora_version} < 26)
+%bcond_without needs_external_argparse
+%else
+%bcond_with needs_external_argparse
+%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}
-%if 0%{?suse_version} >= 1550
+%define pyyaml_package %{use_python}-PyYAML
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
%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}
+%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 ||
0%{?centos_version} >= 800
+%define pyyaml_package %{use_python}-PyYAML
+%else
+%define pyyaml_package PyYAML
+%endif
+
+%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 ||
0%{?centos_version} >= 800
%define locale_package glibc-langpack-en
+%else
+%define locale_package glibc-common
+%endif
%endif
-%bcond_without obs_scm_testsuite
+%if 0%{?mageia} || 0%{?mandriva_version}
+%define pyyaml_package python-yaml
+%define locale_package locales
+%endif
+
+# avoid code duplication
+%define scm_common_dep \
+Requires: obs-service-obs_scm-common = %version-%release \
+%{nil}
+
+%define scm_dependencies \
+Requires: git-core \
+%if 0%{?suse_version} >= 1315 \
+Recommends: bzr \
+Recommends: mercurial \
+Recommends: subversion \
+Recommends: obs-service-download_files \
+%endif \
+%{nil}
+
+######## END OF MACROS AND FUN ###################################
Name: obs-service-tar_scm
-%define version_unconverted 0.10.6.1551887937.e42c270
-Version: 0.10.6.1551887937.e42c270
+%define version_unconverted 0.10.9.1557261720.32a1cdb
+Version: 0.10.9.1557261720.32a1cdb
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}
-%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 \
-%{-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 \
-}
-
-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
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
+BuildRequires: %{locale_package}
+BuildRequires: %{pyyaml_package}
+%if %{with needs_external_argparse}
+BuildRequires: %{use_python}-argparse
+%endif
+BuildRequires: %{use_python}-dateutil
+# Why do we need this? we dont use it as runtime requires later
+BuildRequires: %{use_python}-lxml
+
+%if %{with python3}
+BuildRequires: %{use_python}
+%else
+BuildRequires: python >= 2.6
%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
+#
+#
+#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -87,31 +145,24 @@
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
-%if 0%{?suse_version} < 1315
-Requires: python-argparse
-%endif
-%endif
-
-%if 0%{?fedora_version} >= 25
-Requires: python2
+Requires: %{pyyaml_package}
+Requires: %{use_python}-dateutil
+%if %{with needs_external_argparse}
+Requires: %{use_python}-argparse
%endif
%description -n obs-service-obs_scm-common
+This is a source service for openSUSE Build Service.
+
+It supports downloading from svn, git, hg and bzr repositories.
+
+This package holds the shared files for different services.
%package -n obs-service-tar
Summary: Creates a tar archive from local directory
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
-%endif
+%scm_common_dep
%description -n obs-service-tar
Creates a tar archive from local directory
@@ -120,13 +171,8 @@
Summary: Creates a OBS cpio from a remote SCM resource
Group: Development/Tools/Building
Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_scm.service
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
-%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
%description -n obs-service-obs_scm
Creates a OBS cpio from a remote SCM resource.
@@ -137,14 +183,8 @@
%package -n obs-service-appimage
Summary: Handles source downloads defined in appimage.yml files
Group: Development/Tools/Building
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
-Recommends: obs-service-download_files
-%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
%description -n obs-service-appimage
Experimental appimage support: This parses appimage.yml files for SCM
@@ -154,14 +194,8 @@
Summary: Handles source downloads defined in snapcraft.yaml files
Group: Development/Tools/Building
Provides: obs-service-tar_scm:/usr/lib/obs/service/snapcraft.service
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
-Recommends: obs-service-download_files
-%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
%description -n obs-service-snapcraft
Experimental snapcraft support: This parses snapcraft.yaml files for SCM
@@ -172,24 +206,17 @@
%setup -q -n obs-service-tar_scm-%version
%build
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-%py_compile .
-%else
-%py_compile %{buildroot}
-%endif
%install
-make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
+make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}"
%if %{with obs_scm_testsuite}
-%if 0%{?suse_version} >= 1220
-
+# 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
# brittle BuildRequires: python-pep8, and any style issues are already
# caught by Travis CI.
-make test
-%endif
+make %{use_test}
%endif
%files
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.4KcJgf/_old 2019-05-28 09:40:11.521907125 +0200
+++ /var/tmp/diff_new_pack.4KcJgf/_new 2019-05-28 09:40:11.521907125 +0200
@@ -1,5 +1,5 @@
pkgname=obs-service-tar_scm
-pkgver=0.10.6.1551887937.e42c270
+pkgver=0.10.9.1557261720.32a1cdb
pkgrel=0
pkgdesc="Source Service for the OpenSUSE Build Service (OBS)"
arch=('any')
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.4KcJgf/_old 2019-05-28 09:40:11.553907114 +0200
+++ /var/tmp/diff_new_pack.4KcJgf/_new 2019-05-28 09:40:11.553907114 +0200
@@ -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>
\ No newline at end of file
+ <param
name="changesrevision">d35048f2cac019c9f452fe8fac2fe1eab5018e6e</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.4KcJgf/_old 2019-05-28 09:40:11.569907109 +0200
+++ /var/tmp/diff_new_pack.4KcJgf/_new 2019-05-28 09:40:11.573907107 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-tar-scm
-Version: 0.10.6.1551887937.e42c270
+Version: 0.10.9.1557261720.32a1cdb
Provides: obs-service-obs_scm, obs-service-tar
Binary: obs-service-tar_scm
Maintainer: Adrian Schroeter <[email protected]>
++++++ obs-service-tar_scm-0.10.6.1551887937.e42c270.tar.gz ->
obs-service-tar_scm-0.10.9.1557261720.32a1cdb.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.6.1551887937.e42c270/GNUmakefile
new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/GNUmakefile
--- old/obs-service-tar_scm-0.10.6.1551887937.e42c270/GNUmakefile
2019-03-06 16:58:57.000000000 +0100
+++ new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/GNUmakefile
2019-05-07 22:42:00.000000000 +0200
@@ -53,19 +53,19 @@
)
endef
-# On ArchLinux, /usr/bin/python is Python 3, and other distros
-# will switch to the same at various points. So until we support
-# Python 3, we need to do our best to ensure we have Python 2.
-PYTHON3 = python3 python3.6 python-3.6 python
-PYTHON2 = python2 python2.7 python-2.7 python2.6 python-2.6 python
-ALL_PYTHONS = $(PYTHON3) $(PYTHON2)
+PYTHON3 = python3.7 python-3.7 python3.6 python-3.6 python3.5 python-3.5
python3.4 python-3.4 python3.3 python-3.3 python3.2 python-3.2 python3
+PYTHON2 = python2.7 python-2.7 python2.6 python-2.6 python2
+
+# Ensure that correct python version is used in travis
PYTHON_MAJOR := $(shell python -c "import sys; print sys.version[:1]"
2>/dev/null)
ifeq ($(PYTHON_MAJOR), 2)
-PYTHON := $(shell which python2)
+ALL_PYTHONS = $(PYTHON2) python
else
-PYTHON = $(call first_in_path,$(ALL_PYTHONS))
+ALL_PYTHONS = $(PYTHON3) $(PYTHON2) python
endif
+PYTHON = $(call first_in_path,$(ALL_PYTHONS))
+
mylibdir = $(PREFIX)/lib/obs/service
mycfgdir = $(SYSCFG)/obs/services
@@ -165,7 +165,7 @@
.PHONY: install
-install: dirs tar_scm service
+install: dirs tar_scm service compile
install -m 0755 tar_scm $(DESTDIR)$(mylibdir)/tar_scm
install -m 0644 tar_scm.rc $(DESTDIR)$(mycfgdir)/tar_scm
# Recreate links, otherwise reinstalling would fail
@@ -177,7 +177,7 @@
ln -s tar_scm $(DESTDIR)$(mylibdir)/appimage
[ ! -L $(DESTDIR)$(mylibdir)/snapcraft ] || rm
$(DESTDIR)$(mylibdir)/snapcraft
ln -s tar_scm $(DESTDIR)$(mylibdir)/snapcraft
- find ./TarSCM/ -name '*.py*' -exec install -m 644 {}
$(DESTDIR)$(mylibdir)/{} \;
+ find ./TarSCM/ -name '*.py*' -exec install -D -m 644 {}
$(DESTDIR)$(mylibdir)/{} \;
.PHONY: dirs
dirs:
@@ -206,4 +206,4 @@
rm -f ./cover.log
compile:
- find -name '*.py' -exec python -m py_compile {} \;
+ find -name '*.py' -exec $(PYTHON) -m py_compile {} \;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.6.1551887937.e42c270/TarSCM/archive.py
new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/TarSCM/archive.py
--- old/obs-service-tar_scm-0.10.6.1551887937.e42c270/TarSCM/archive.py
2019-03-06 16:58:57.000000000 +0100
+++ new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/TarSCM/archive.py
2019-05-07 22:42:00.000000000 +0200
@@ -114,9 +114,10 @@
# bytes() break in python2 with a TypeError as it expects only 1
# arg
try:
- proc.stdin.write(bytes(name, 'UTF-8'))
+ proc.stdin.write(name.encode('UTF-8', 'surrogateescape'))
except TypeError:
proc.stdin.write(name)
+
proc.stdin.write(b"\n")
proc.stdin.close()
ret_code = proc.wait()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.6.1551887937.e42c270/TarSCM/cli.py
new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/TarSCM/cli.py
--- old/obs-service-tar_scm-0.10.6.1551887937.e42c270/TarSCM/cli.py
2019-03-06 16:58:57.000000000 +0100
+++ new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/TarSCM/cli.py
2019-05-07 22:42:00.000000000 +0200
@@ -176,5 +176,6 @@
locale.setlocale(locale.LC_ALL, args.locale)
os.environ["LC_ALL"] = args.locale
os.environ["LANG"] = args.locale
+ os.environ["LANGUAGE"] = args.locale
return args
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.6.1551887937.e42c270/dist/obs-service-tar_scm.spec
new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/dist/obs-service-tar_scm.spec
---
old/obs-service-tar_scm-0.10.6.1551887937.e42c270/dist/obs-service-tar_scm.spec
2019-03-06 16:58:57.000000000 +0100
+++
new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/dist/obs-service-tar_scm.spec
2019-05-07 22:42:00.000000000 +0200
@@ -15,65 +15,124 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
+%if 0%{?suse_version} && 0%{?suse_version} >= 1220
+%bcond_without obs_scm_testsuite
+%else
+%bcond_with obs_scm_testsuite
+%endif
+
+%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+# This list probably needs to be extended
+# logic seems to be if python < 2.7 ; then needs_external_argparse ; fi
+%if (0%{?centos_version} == 6) || (0%{?suse_version} && 0%{?suse_version} <
1315) || (0%{?fedora_version} && 0%{?fedora_version} < 26)
+%bcond_without needs_external_argparse
+%else
+%bcond_with needs_external_argparse
+%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}
-%if 0%{?suse_version} >= 1550
+%define pyyaml_package %{use_python}-PyYAML
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
%define locale_package glibc-locale-base
%else
%define locale_package glibc-locale
%endif
%endif
-%if %{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} ||
0%{?scientificlinux_version}
+%if 0%{?fedora_version} >= 29 || 0%{?rhel_version} >= 800 ||
0%{?centos_version} >= 800
+%define pyyaml_package %{use_python}-PyYAML
+%else
+%define pyyaml_package PyYAML
+%endif
+
+%if 0%{?fedora_version} >= 24 || 0%{?rhel_version} >= 800 ||
0%{?centos_version} >= 800
%define locale_package glibc-langpack-en
+%else
+%define locale_package glibc-common
+%endif
%endif
-%bcond_without obs_scm_testsuite
+%if 0%{?mageia} || 0%{?mandriva_version}
+%define pyyaml_package python-yaml
+%define locale_package locales
+%endif
+
+# avoid code duplication
+%define scm_common_dep \
+Requires: obs-service-obs_scm-common = %version-%release \
+%{nil}
+
+%define scm_dependencies \
+Requires: git-core \
+%if 0%{?suse_version} >= 1315 \
+Recommends: bzr \
+Recommends: mercurial \
+Recommends: subversion \
+Recommends: obs-service-download_files \
+%endif \
+%{nil}
+
+######## END OF MACROS AND FUN ###################################
Name: obs-service-tar_scm
-%define version_unconverted 0.9.5.1545082095.8dbc95f
-Version: 0.9.5.1545082095.8dbc95f
+%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
-BuildRequires: %{locale_package}
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_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 \
-%{-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 \
-}
-
-BuildRequires: PyYAML
-%else
-BuildRequires: python-PyYAML
-%endif
-BuildRequires: python-dateutil
-BuildRequires: python-lxml
-BuildRequires: python-mock
-BuildRequires: python-unittest2
-BuildRequires: python-six
%endif
-BuildRequires: python >= 2.6
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
+BuildRequires: %{locale_package}
+BuildRequires: %{pyyaml_package}
+%if %{with needs_external_argparse}
+BuildRequires: %{use_python}-argparse
+%endif
+BuildRequires: %{use_python}-dateutil
+# Why do we need this? we dont use it as runtime requires later
+BuildRequires: %{use_python}-lxml
+
+%if %{with python3}
+BuildRequires: %{use_python}
+%else
+BuildRequires: python >= 2.6
%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
+#
+#
+#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -85,32 +144,25 @@
%package -n obs-service-obs_scm-common
Summary: Common parts of SCM handling services
Group: Development/Tools/Building
-Requires: python-dateutil
Requires: %{locale_package}
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-Requires: PyYAML
-%else
-Requires: python-PyYAML
-%if 0%{?suse_version} < 1315
-Requires: python-argparse
-%endif
-%endif
-
-%if 0%{?fedora_version} >= 25
-Requires: python2
+Requires: %{pyyaml_package}
+Requires: %{use_python}-dateutil
+%if %{with needs_external_argparse}
+Requires: %{use_python}-argparse
%endif
%description -n obs-service-obs_scm-common
+This is a source service for openSUSE Build Service.
+
+It supports downloading from svn, git, hg and bzr repositories.
+
+This package holds the shared files for different services.
%package -n obs-service-tar
Summary: Creates a tar archive from local directory
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
-%endif
+%scm_common_dep
%description -n obs-service-tar
Creates a tar archive from local directory
@@ -119,13 +171,8 @@
Summary: Creates a OBS cpio from a remote SCM resource
Group: Development/Tools/Building
Provides: obs-service-tar_scm:/usr/lib/obs/service/obs_scm.service
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
-%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
%description -n obs-service-obs_scm
Creates a OBS cpio from a remote SCM resource.
@@ -136,14 +183,8 @@
%package -n obs-service-appimage
Summary: Handles source downloads defined in appimage.yml files
Group: Development/Tools/Building
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
-Recommends: obs-service-download_files
-%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
%description -n obs-service-appimage
Experimental appimage support: This parses appimage.yml files for SCM
@@ -153,14 +194,8 @@
Summary: Handles source downloads defined in snapcraft.yaml files
Group: Development/Tools/Building
Provides: obs-service-tar_scm:/usr/lib/obs/service/snapcraft.service
-Requires: git-core
-%if 0%{?suse_version} >= 1315
-Recommends: bzr
-Recommends: mercurial
-Recommends: subversion
-Recommends: obs-service-download_files
-%endif
-Requires: obs-service-obs_scm-common = %version-%release
+%scm_common_dep
+%scm_dependencies
%description -n obs-service-snapcraft
Experimental snapcraft support: This parses snapcraft.yaml files for SCM
@@ -171,24 +206,17 @@
%setup -q -n obs-service-tar_scm-%version
%build
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-%py_compile .
-%else
-%py_compile %{buildroot}
-%endif
%install
-make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
+make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
SYSCFG="%{_sysconfdir}" PYTHON="%{_bindir}/%{use_python}"
%if %{with obs_scm_testsuite}
-%if 0%{?suse_version} >= 1220
-
+# 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
# brittle BuildRequires: python-pep8, and any style issues are already
# caught by Travis CI.
-make test
-%endif
+make %{use_test}
%endif
%files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-tar_scm-0.10.6.1551887937.e42c270/tests/fixtures.py
new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/tests/fixtures.py
--- old/obs-service-tar_scm-0.10.6.1551887937.e42c270/tests/fixtures.py
2019-03-06 16:58:57.000000000 +0100
+++ new/obs-service-tar_scm-0.10.9.1557261720.32a1cdb/tests/fixtures.py
2019-05-07 22:42:00.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
# -*- coding: utf-8 -*-
import os
