diff --git a/python-jmespath.changes b/python-jmespath.changes index 3e02551..d6e4a27 100644 --- a/python-jmespath.changes +++ b/python-jmespath.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 13 11:20:47 UTC 2018 - mcepl@suse.com + +- Remove dependency on unittest2 +- Clean up SPEC file + ------------------------------------------------------------------- Thu Nov 9 23:08:53 UTC 2017 - rjschwei@suse.com diff --git a/python-jmespath.spec b/python-jmespath.spec index f7104ed..f2060b9 100644 --- a/python-jmespath.spec +++ b/python-jmespath.spec @@ -1,7 +1,7 @@ # # spec file for package python-jmespath # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,28 +23,24 @@ Release: 0 Summary: Extract elements from JSON document License: MIT Group: Development/Languages/Python -Url: https://github.com/boto/jmespath -Source: https://pypi.io/packages/source/j/jmespath/jmespath-%{version}.tar.gz +URL: https://github.com/boto/jmespath +Source: https://files.pythonhosted.org/packages/source/j/jmespath/jmespath-%{version}.tar.gz BuildRequires: %{python_module devel} +# Testing +BuildRequires: %{python_module nose} BuildRequires: %{python_module ply >= 3.4} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module simplejson} +BuildRequires: fdupes BuildRequires: python-rpm-macros -# Testing -BuildRequires: %{python_module nose} -%ifpython2 -BuildRequires: python-unittest2 -%endif Requires: python-base Requires: python-ply >= 3.4 Requires: python-simplejson -Requires(post): update-alternatives +Requires(post): update-alternatives Requires(postun): update-alternatives - %if 0%{?suse_version} > 1110 BuildArch: noarch %endif - %python_subpackages %description @@ -83,17 +79,12 @@ The expression: foo.*.name will return ["one", "two"]. %build %python_build -#pushd build/scripts-%{$python_bin_suffix} -#mv jp.py jp-%{$python_bin_suffix} -#popd -#pushd build/scripts-%{py_ver} -#mv jp.py jp-%{py_ver} -#popd %install %python_install mv %{buildroot}%{_bindir}/jp.py %{buildroot}%{_bindir}/jp %python_clone -a %{buildroot}%{_bindir}/jp +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check %python_expand nosetests-%{$python_bin_suffix} tests @@ -105,8 +96,8 @@ mv %{buildroot}%{_bindir}/jp.py %{buildroot}%{_bindir}/jp %python_uninstall_alternative jp %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE.txt README.rst +%license LICENSE.txt +%doc README.rst %{python_sitelib}/* %python_alternative %{_bindir}/jp