New version

python-jmespath.spec

@@ -1,107 +1,103 @@
-%if 0%{?fedora} > 12
+%if 0%{?rhel}
-%bcond_without python3
+%global with_python3 0
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
+%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
 %else
-%bcond_with python3
+%global with_python3 1
 %endif
 
-Name:           python-jmespath
+%global pypi_name jmespath
-Version:        0.5.0
+
-Release:        3%{?dist}
+Name:           python-%{pypi_name}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        JSON Matching Expressions
-Group:          System Environment/Libraries
-
-License:        ASL 2.0
-URL:            https://github.com/boto/jmespath
-Source0:        https://pypi.python.org/packages/source/j/jmespath/jmespath-%{version}.tar.gz
 
+License:        MIT
+URL:            https://github.com/jmespath/jmespath.py
+Source0:        https://pypi.python.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
+
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-BuildRequires:  python-nose
+%if 0%{?with_python3}
-%if %with python3
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-nose
+%endif # with_python3
-%endif
 
 %description
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.
 
-This package contains the library for Python 2.
+%package -n     python2-%{pypi_name}
-
-
-%package -n python3-jmespath
 Summary:        JSON Matching Expressions
-Group:          System Environment/Libraries
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
-%description -n python3-jmespath
+%description -n python2-%{pypi_name}
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.
 
-This package contains the library for Python 3.
+%if 0%{?with_python3}
+%package -n     python3-%{pypi_name}
+Summary:        JSON Matching Expressions
+%{?python_provide:%python_provide python3-%{pypi_name}}
 
+%description -n python3-%{pypi_name}
+JMESPath allows you to declaratively specify how to extract elements from
+a JSON document.
+%endif # with_python3
 
 %prep
-%setup -q -n jmespath-%{version}
+%setup -n %{pypi_name}-%{version}
-
+rm -rf %{pypi_name}.egg-info
-%if %with python3
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-find %{py3dir} -name '*.py' |xargs sed -i 's|^#!.*python|#!%{__python3}|'
-%endif
-
-find -name '*.py' |xargs sed -i 's|^#!.*python|#!%{__python2}|'
-
 
 %build
-%if %with python3
+%py2_build
-pushd %{py3dir}
+%if 0%{?with_python3}
-%{__python3} setup.py build
+%py3_build
-popd
+%endif # with_python3
-%endif
-
-%{__python2} setup.py build
-
 
 %install
-%if %with python3
+%if 0%{?with_python3}
-pushd %{py3dir}
+%py3_install
-%{__python3} setup.py install --skip-build --root %{buildroot}
+cp %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-3
-mv %{buildroot}%{_bindir}/{,python3-}jp
+ln -sf %{_bindir}/jp.py-3 %{buildroot}/%{_bindir}/jp.py-%{python3_version}
-popd
+%endif # with_python3
-%endif
 
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
+cp %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-2
+ln -sf %{_bindir}/jp.py-2 %{buildroot}/%{_bindir}/jp.py-%{python2_version}
 
 
-%check
+%files -n python2-%{pypi_name}
-%if %with python3
+%{!?_licensedir:%global license %doc}
-pushd %{py3dir}
-%{__python3} setup.py test
-popd
-%endif
-
-%{__python2} setup.py test
-
-
-%files
-%{python2_sitelib}/*
-%{_bindir}/jp
 %doc README.rst
-%doc LICENSE.txt
+%license LICENSE.txt
+%{_bindir}/jp.py
+%{_bindir}/jp.py-2
+%{_bindir}/jp.py-%{python2_version}
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
-
+%if 0%{?with_python3}
-%if %with python3
+%files -n python3-%{pypi_name}
-%files -n python3-jmespath
-%{python3_sitelib}/*
-%{_bindir}/python3-jp
 %doc README.rst
-%doc LICENSE.txt
+%license LICENSE.txt
-%endif
+%{_bindir}/jp.py-3
-
+%{_bindir}/jp.py-%{python3_version}
+%{python3_sitelib}/%{pypi_name}
+%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%endif # with_python3
 
 %changelog
+* Tue Dec 29 2015 Fabio Alessandro Locati <fabio@locati.cc> - 0.9.0-1
+- Upgrade to upstream current version
+- Improve the spec file
+- Make possible to build in EL6
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5