Attachment 1112947 Details for Bug 1296974 – patch to python-beanbag.spec

[patch] patch to python-beanbag.spec

0001-Feedback.patch (text/plain), 3.54 KB, created by Ralph Bean on 2016-01-08 18:40:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Bean

Created: 2016-01-08 18:40:55 UTC

Size: 3.54 KB

patch

obsolete

>From 5fa2fd1e57ea17e62c96f3c295927a9633c62f19 Mon Sep 17 00:00:00 2001
>From: Ralph Bean <rbean@redhat.com>
>Date: Fri, 8 Jan 2016 13:38:12 -0500
>Subject: [PATCH] Feedback.
>
>---
> python-beanbag.spec | 73 +++++++++++++++++++++++++----------------------------
> 1 file changed, 35 insertions(+), 38 deletions(-)
>
>diff --git a/python-beanbag.spec b/python-beanbag.spec
>index 1b64c4d..439942e 100644
>--- a/python-beanbag.spec
>+++ b/python-beanbag.spec
>@@ -1,14 +1,13 @@
>-%if 0%{?fedora} > 12
>+%if 0%{?fedora}
> %global with_python3 1
> %else
> %{!?__python2: %global __python2 /usr/bin/python2}
> %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
> %endif
> 
>-
> Name:           python-beanbag
> Version:        1.9.2
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        A helper module for accessing REST APIs
> License:        MIT
> URL:            https://github.com/ajtowns/beanbag
>@@ -30,11 +29,25 @@ BuildRequires:  python3-pytest
> BuildRequires:  python3-requests
> %endif # if with_python3
> 
>-%{?python_provide:%python_provide python-beanbag}
> 
>+%description
>+BeanBag is a simple module that lets you access REST APIs in an easy way. For
>+example:
>+
>+>>> import beanbag
>+>>> github = beanbag.BeanBag("https://api.github.com")
>+>>> watchers = github.repos.ajtowns.beanbag.watchers()
>+>>> for w in watchers:
>+...     print(w["login"])
>+
>+See http://beanbag.readthedocs.org/ for more information.
>+
>+%package -n python2-beanbag
>+Summary:        A helper module for accessing REST APIs
>+%{?python_provide:%python_provide python2-beanbag}
> Requires:  python-requests
> 
>-%description
>+%description -n python2-beanbag
> BeanBag is a simple module that lets you access REST APIs in an easy way. For
> example:
> 
>@@ -65,55 +78,39 @@ See http://beanbag.readthedocs.org/ for more information.
> %prep
> %setup -q -n beanbag-%{version}
> 
>-%if 0%{?with_python3}
>-rm -rf %{py3dir}
>-cp -a . %{py3dir}
>-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
>-%endif # with_python3
>-
>-find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
>-
> %build
>-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
>-
>+%py2_build
> %if 0%{?with_python3}
>-pushd %{py3dir}
>-CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
>-popd
>+%py3_build
> %endif # with_python3
> 
>-%check
>-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py nosetests || exit 1
>-
>+%install
>+%py2_install
> %if 0%{?with_python3}
>-pushd %{py3dir}
>-CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py nosetests || exit 1
>-popd
>+%py3_install
> %endif # with_python3
> 
>-%install
>-# Must do the python3 install first because the scripts in /usr/bin are
>-# overwritten with every setup.py install (and we want the python2 version
>-# to be the default for now).
>+%check
>+%{__python2} setup.py nosetests || exit 1
> %if 0%{?with_python3}
>-pushd %{py3dir}
>-%{__python3} setup.py install --skip-build --root %{buildroot}
>-popd
>+%{__python3} setup.py nosetests || exit 1
> %endif # with_python3
> 
>-%{__python} setup.py install --skip-build --root %{buildroot}
>-
>-%files
>-%doc LICENSE README.rst
>-%{python_sitelib}/beanbag*
>+%files -n python2-beanbag
>+%doc README.rst
>+%license LICENSE
>+%{python2_sitelib}/beanbag*
> 
> %if 0%{?with_python3}
> %files -n python3-beanbag
>-%doc LICENSE README.rst
>+%doc README.rst
>+%license LICENSE
> %{python3_sitelib}/beanbag*
> %endif # with_python3
> 
>-
> %changelog
>+* Fri Jan 08 2016 Ralph Bean <rbean@redhat.com> - 1.9.2-2
>+- Some changes during package review.
>+
> * Fri Jan 08 2016 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.9.2-1
> - Initial version
>-- 
>2.5.0
>

Actions: View | Diff

Attachments on bug 1296974: 1112947