Hello community,
here is the log from the commit of package python-requests for openSUSE:Factory
checked in at 2019-01-03 18:05:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-requests (Old)
and /work/SRC/openSUSE:Factory/.python-requests.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-requests"
Thu Jan 3 18:05:28 2019 rev:54 rq:662199 version:2.20.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-requests/python-requests.changes
2018-11-28 11:09:44.935204209 +0100
+++
/work/SRC/openSUSE:Factory/.python-requests.new.28833/python-requests.changes
2019-01-03 18:05:29.824200676 +0100
@@ -1,0 +2,7 @@
+Mon Dec 31 12:24:10 CET 2018 - [email protected]
+
+- Move name ahead of version in spec file to resolve build issues
+ on older distributions
+- fdupe more thoroughly.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-requests.spec ++++++
--- /var/tmp/diff_new_pack.LJZEDJ/_old 2019-01-03 18:05:30.320200236 +0100
+++ /var/tmp/diff_new_pack.LJZEDJ/_new 2019-01-03 18:05:30.324200232 +0100
@@ -17,11 +17,17 @@
%global flavor @BUILD_FLAVOR@%{nil}
-%define test 0
%if "%{flavor}" == "test"
-%define test 1
+%bcond_without test
+%else
+%bcond_with test
%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%if %{with test}
+Name: python-requests-%{flavor}
+%else
+Name: python-requests
+%endif
Version: 2.20.1
Release: 0
Summary: Python HTTP Library
@@ -50,12 +56,7 @@
Recommends: python-cryptography >= 1.3.4
Recommends: python-pyOpenSSL >= 0.14
BuildArch: noarch
-%if %{test}
-Name: python-requests-%{flavor}
-%else
-Name: python-requests
-%endif
-%if %{test}
+%if %{with test}
BuildRequires: %{python_module PySocks >= 1.5.6}
BuildRequires: %{python_module chardet >= 3.0.2}
BuildRequires: %{python_module idna < 2.8}
@@ -102,22 +103,21 @@
%python_install
# check that urllib3 is not installed
test ! -e %{buildroot}%{python3_sitelib}/requests/packages/urllib3
-%python_expand %fdupes %{buildroot}%{$python_sitelib}/requests
-%if %{test}
-%python_expand rm -Rf %{buildroot}%{$python_sitelib}/requests
-%python_expand rm -Rf %{buildroot}%{$python_sitelib}/requests-*
+%python_expand %fdupes %{buildroot}%{$python_sitelib}/
+%if %{with test}
+%python_expand rm -Rf %{buildroot}%{$python_sitelib}/requests*
%endif
# NOTE(aplanas) If we do not have the certificates, we some of the
# tests will fail, so for now we only run the tests in openSUSE
-%if 0%{?suse_version} && %{test}
+%if 0%{?suse_version} && %{with test}
%check
touch Pipfile
# exclude tests connecting to TARPIT
%python_exec -m pytest tests -k "not (TestTimeout and connect)"
%endif
-%if %{test}
+%if %{with test}
%files %{python_files}
%license LICENSE
%else
