#2 Update to 0.9.4 + Add python3 subpkg
Merged 2 years ago by ignatenkobrain. Opened 2 years ago by ignatenkobrain.
rpms/ ignatenkobrain/python-jmespath epel7  into  epel7

file modified
+1
@@ -1,3 +1,4 @@ 

  /jmespath-0.4.1.tar.gz

  /jmespath-0.5.0.tar.gz

  /jmespath-0.9.0.tar.gz

+ /jmespath-0.9.4.tar.gz

file modified
+25 -51
@@ -1,99 +1,73 @@ 

- %if 0%{?rhel}

- %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

- %global with_python3 1

- %endif

- 

  %global pypi_name jmespath

  

  Name:           python-%{pypi_name}

- Version:        0.9.0

- Release:        2%{?dist}

+ Version:        0.9.4

+ Release:        1%{?dist}

  Summary:        JSON Matching Expressions

  

  License:        MIT

  URL:            https://github.com/jmespath/jmespath.py

- Source0:        https://pypi.python.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz

+ Source0:        %{pypi_source}

  BuildArch:      noarch

  

- BuildRequires:  python2-devel

- BuildRequires:  python-setuptools

- %if 0%{?with_python3}

- BuildRequires:  python3-devel

- BuildRequires:  python3-setuptools

- %endif # with_python3

- 

  %description

  JMESPath allows you to declaratively specify how to extract elements from

  a JSON document.

  

  %package -n     python2-%{pypi_name}

- Summary:        JSON Matching Expressions

- %{?el6:Provides: python-%{pypi_name}}

+ Summary:        %{summary}

  %{?python_provide:%python_provide python2-%{pypi_name}}

+ BuildRequires:  python2-devel

+ BuildRequires:  python2-setuptools

  

  %description -n python2-%{pypi_name}

  JMESPath allows you to declaratively specify how to extract elements from

  a JSON document.

  

- %if 0%{?with_python3}

- %package -n     python3-%{pypi_name}

- Summary:        JSON Matching Expressions

- %{?python_provide:%python_provide python3-%{pypi_name}}

+ %package -n     python%{python3_pkgversion}-%{pypi_name}

+ Summary:        %{summary}

+ BuildRequires:  python%{python3_pkgversion}-devel

+ BuildRequires:  python%{python3_pkgversion}-setuptools

+ %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}

  

- %description -n python3-%{pypi_name}

+ %description -n python%{python3_pkgversion}-%{pypi_name}

  JMESPath allows you to declaratively specify how to extract elements from

  a JSON document.

- %endif # with_python3

  

  %prep

- %setup -q -n %{pypi_name}-%{version}

- rm -rf %{pypi_name}.egg-info

+ %autosetup -n %{pypi_name}-%{version}

+ rm -vr %{pypi_name}.egg-info

  

  %build

  %py2_build

- %if 0%{?with_python3}

  %py3_build

- %endif # with_python3

  

  %install

- %if 0%{?with_python3}

  %py3_install

- cp %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-3

- ln -sf %{_bindir}/jp.py-3 %{buildroot}/%{_bindir}/jp.py-%{python3_version}

- %endif # with_python3

- 

  %py2_install

- cp %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-2

- ln -sf %{_bindir}/jp.py-2 %{buildroot}/%{_bindir}/jp.py-%{python2_version}

- 

+ cp -a %{buildroot}%{_bindir}/jp.py{,-2}

+ ln -sf %{_bindir}/jp.py-2 %{buildroot}%{_bindir}/jp.py-%{python2_version}

  

  %files -n python2-%{pypi_name}

- %{!?_licensedir:%global license %doc}

  %doc README.rst

  %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

+ %{python2_sitelib}/%{pypi_name}/

+ %{python2_sitelib}/%{pypi_name}-*.egg-info/

  

- %if 0%{?with_python3}

- %files -n python3-%{pypi_name}

+ %files -n python%{python3_pkgversion}-%{pypi_name}

  %doc README.rst

  %license LICENSE.txt

- %{_bindir}/jp.py-3

- %{_bindir}/jp.py-%{python3_version}

- %{python3_sitelib}/%{pypi_name}

- %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info

- %endif # with_python3

+ %{python3_sitelib}/%{pypi_name}/

+ %{python3_sitelib}/%{pypi_name}-*.egg-info/

  

  %changelog

+ * Sun Apr 05 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.9.4-1

+ - Update to 0.9.4

+ - Add python3 subpackage

+ 

  * Wed Jan 06 2016 Fabio Alessandro Locati <fabio@locati.cc> - 0.9.0-2

  - Improve to set the Provides tag for EL6 too

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 471b7d19bd153ac11a21d4fb7466800c  jmespath-0.9.0.tar.gz

+ SHA512 (jmespath-0.9.4.tar.gz) = 173ec36708f93f72fece049b71846a226010c00498ab51e58bee26a09cc73cf96a062df215d3737eb266e689c2ecf7a2be95b009ed74ad122f6739d4379466c6

@kevin this is essentially only one thing which is missing for ansible-on-python3-in-epel7.

Doesn't seem to build right. ;)

I think you missed a python3 on line 33 that needs to be python%{python3_pkgversion} ?
You may also need a provides python3-%name there too?

rebased onto c0a9061

2 years ago

Pull-Request has been merged by ignatenkobrain

2 years ago