From 358e812c83a706dd7e8762adbfd140652d4810e3035ccac194fc6f6928508154 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 29 Jul 2015 12:55:52 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=34 --- python-six.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python-six.spec b/python-six.spec index cf687b1..cbe59d1 100644 --- a/python-six.spec +++ b/python-six.spec @@ -15,6 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# NOTE(saschpe): git invocation and pythonpath issues with testrepository +# enable testing with a build conditional (off by default): +%bcond_with test Name: python-six Version: 1.9.0 @@ -26,9 +29,11 @@ Group: Development/Libraries/Python Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +%if %{with test} # Test requirements: BuildRequires: python-py BuildRequires: python-pytest +%endif %if 0%{?suse_version} <= 1110 BuildRequires: python-argparse Requires: python-argparse @@ -56,8 +61,10 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%if %{with test} %check python test_six.py +%endif %files %defattr(-,root,root) From 67eeb13a649ec188dc602e6a3e5eff914fc5f2f37e5dc5e22db1df5340ff01a4 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 29 Jul 2015 12:57:25 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=35 --- python-six.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/python-six.spec b/python-six.spec index cbe59d1..cf687b1 100644 --- a/python-six.spec +++ b/python-six.spec @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# NOTE(saschpe): git invocation and pythonpath issues with testrepository -# enable testing with a build conditional (off by default): -%bcond_with test Name: python-six Version: 1.9.0 @@ -29,11 +26,9 @@ Group: Development/Libraries/Python Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -%if %{with test} # Test requirements: BuildRequires: python-py BuildRequires: python-pytest -%endif %if 0%{?suse_version} <= 1110 BuildRequires: python-argparse Requires: python-argparse @@ -61,10 +56,8 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%if %{with test} %check python test_six.py -%endif %files %defattr(-,root,root) From 277dadddc64dc5a2cc16978b8cf89b4fe178f0c60234a8ed273f73b4bf34215e Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 29 Jul 2015 13:06:12 +0000 Subject: [PATCH 3/5] Accepting request 319400 from home:TheBlackCat:branches:devel:languages:python Make tests conditional to avoid dependency loop. OBS-URL: https://build.opensuse.org/request/show/319400 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=36 --- python-six.changes | 5 +++++ python-six.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/python-six.changes b/python-six.changes index a07791d..afd93c3 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 29 13:01:56 UTC 2015 - toddrme2178@gmail.com + +- Make tests conditional to avoid dependency loop. + ------------------------------------------------------------------- Thu Apr 16 10:41:33 UTC 2015 - hpj@urpla.net diff --git a/python-six.spec b/python-six.spec index cf687b1..cbe59d1 100644 --- a/python-six.spec +++ b/python-six.spec @@ -15,6 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# NOTE(saschpe): git invocation and pythonpath issues with testrepository +# enable testing with a build conditional (off by default): +%bcond_with test Name: python-six Version: 1.9.0 @@ -26,9 +29,11 @@ Group: Development/Libraries/Python Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +%if %{with test} # Test requirements: BuildRequires: python-py BuildRequires: python-pytest +%endif %if 0%{?suse_version} <= 1110 BuildRequires: python-argparse Requires: python-argparse @@ -56,8 +61,10 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%if %{with test} %check python test_six.py +%endif %files %defattr(-,root,root) From dc0cde9671a661278b03f67ee26f38ecc88a1f519e7f21fe29d14bf7b7cca6b5 Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 4 Aug 2015 08:41:26 +0000 Subject: [PATCH 4/5] Accepting request 320309 from home:dimstar:Factory - Delete the system egg-info during pre phase: older versions of the package installed it as a directory, the latest update creates a file, and rpm has known issues with replacing this. OBS-URL: https://build.opensuse.org/request/show/320309 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=37 --- python-six.changes | 7 +++++++ python-six.spec | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/python-six.changes b/python-six.changes index afd93c3..4bdd063 100644 --- a/python-six.changes +++ b/python-six.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 4 07:50:17 UTC 2015 - dimstar@opensuse.org + +- Delete the system egg-info during pre phase: older versions of + the package installed it as a directory, the latest update + creates a file, and rpm has known issues with replacing this. + ------------------------------------------------------------------- Wed Jul 29 13:01:56 UTC 2015 - toddrme2178@gmail.com diff --git a/python-six.spec b/python-six.spec index cbe59d1..0bf1ef1 100644 --- a/python-six.spec +++ b/python-six.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # NOTE(saschpe): git invocation and pythonpath issues with testrepository # enable testing with a build conditional (off by default): %bcond_with test @@ -66,6 +67,13 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} python test_six.py %endif +%pre +# previous versions of the package installed .egg-info as a directory, +# the new update now installs it as a file. Clean out the directory, should it exist. +if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info; then + rm -rf %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info +fi + %files %defattr(-,root,root) %doc LICENSE README From c13a3655aa730bb34ef06c8a8f9c3b341452f413ea46b1df86baeb14784d1ee7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 4 Aug 2015 12:07:47 +0000 Subject: [PATCH 5/5] Accepting request 320361 from home:dimstar:Factory Fix personal stupidity.... OBS-URL: https://build.opensuse.org/request/show/320361 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-six?expand=0&rev=38 --- python-six.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-six.spec b/python-six.spec index 0bf1ef1..88f9cf2 100644 --- a/python-six.spec +++ b/python-six.spec @@ -70,7 +70,7 @@ python test_six.py %pre # previous versions of the package installed .egg-info as a directory, # the new update now installs it as a file. Clean out the directory, should it exist. -if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info; then +if [ -d %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info ]; then rm -rf %{python_sitelib}/six-%{version}-py%{py_ver}.egg-info fi