Attachment 951896 Details for Bug 1155400 – Second patch proposition for the spec file

[patch] Second patch proposition for the spec file

specfile_002.patch (text/plain), 5.49 KB, created by nicolas.vieville on 2014-10-29 18:44:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nicolas.vieville

Created: 2014-10-29 18:44:10 UTC

Size: 5.49 KB

patch

obsolete

>--- python-pygeoip.orig.spec	2014-10-29 08:27:09.378715765 +0100
>+++ python-pygeoip.spec	2014-10-29 18:26:37.058077426 +0100
>@@ -1,65 +1,82 @@
>-%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
> 
>-%global pypi_name pygeoip
>-
>-Name:              python-%{pypi_name}
>-Version:           0.3.1
>-Release:           1%{?dist}
>-Summary:           Pure Python GeoIP API
>-License:           GPLv3
>-URL:               https://github.com/appliedsec/pygeoip
>-Source0:           https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
>-
>-Group:             Development/Libraries
>-BuildArch:         noarch
>-BuildRequires:     python2-devel
>-BuildRequires:     python-setuptools
>-BuildRequires:     python-nose
>-BuildRequires:     python-tox
>-BuildRequires:     python-sphinx
>-BuildRequires:     python-sphinx_rtd_theme
>-Requires:          GeoIP
>-
>-%if 0%{?with_python3}
>-BuildRequires:    python3-setuptools
>-BuildRequires:    python3-devel
>-BuildRequires:    python3-nose
>-BuildRequires:    python-tox
>-BuildRequires:    python3-sphinx
>-BuildRequires:    python3-sphinx_rtd_theme
>-BuildRequires:    python3
>-Requires:         python3
>-Requires:         GeoIP
>+%global git_name pygeoip
>+%global commit 7501c9327fc80e78be3f44585395e30141d8c749
>+%global shortcommit %(c=%{commit}; echo ${c:0:7})
>+
>+Name:               python-%{git_name}
>+Version:            0.3.1
>+Release:            1%{?dist}
>+Summary:            Pure Python GeoIP API
>+License:            GPLv3
>+URL:                https://github.com/appliedsec/pygeoip
>+Source0:            https://github.com/appliedsec/pygeoip/archive/%{commit}/%{git_name}-%{commit}.tar.gz
>+Source1:            https://www.defunct.cc/maxmind-geoip-samples.tar.gz
>+
>+Group:              Development/Libraries
>+BuildArch:          noarch
>+
>+BuildRequires:      python-setuptools
>+BuildRequires:      python2-devel
>+BuildRequires:      python-nose
>+BuildRequires:      python-tox
>+BuildRequires:      python-sphinx
>+BuildRequires:      python-sphinx_rtd_theme
>+Requires:           GeoIP
>+
>+%if 0%{?with_python3}
>+BuildRequires:      python3-setuptools
>+BuildRequires:      python3-devel
>+BuildRequires:      python3-nose
>+BuildRequires:      python-tox
>+BuildRequires:      python3-sphinx
>+BuildRequires:      python3-sphinx_rtd_theme
>+Requires: GeoIP
> %endif # if with_python3
> 
>-%description
>-Pure Python GeoIP API. GeoIP is a C library that enables the
>-user to find the country that any IP address or hostname originates
>+%global common_desc \
>+Pure Python GeoIP API. GeoIP is a C library that enables the \
>+user to find the country that any IP address or hostname originates \
> from.
> 
>+%description
>+%{common_desc}
>+
>+%package doc
>+Summary:            Documentation for %{name}
>+Group:              Documentation
>+Requires:           %{name} = %{epoch}:%{version}-%{release}
>+Provides:           bundled(jquery)
>+
>+%description doc
>+Users documentation and developer documentation for %{name}.
>+
> %if 0%{?with_python3}
>-%package -n python3-%{pypi_name}
>-Summary: Pure Python GeoIP API
>-Group: Development/Libraries
>-Requires: GeoIP
>+%package -n python3-%{git_name}
>+Summary:            Pure Python GeoIP API
>+
>+%description -n python3-%{git_name}
>+%{common_desc}
> 
>-%description -n python3-%{pypi_name}
>-Pure Python GeoIP API. GeoIP is a C library that enables the
>-user to find the country that any IP address or hostname originates
>-from
>+%package -n python3-%{git_name}-doc
>+Summary:            Documentation for python3-%{git_name}
>+Group:              Documentation
>+Requires:           python3-%{git_name} = %{epoch}:%{version}-%{release}
>+Provides:           bundled(jquery)
> 
>+%description -n python3-%{git_name}-doc
>+Users documentation and developer documentation for python3-%{git_name}.
> %endif # if with_python3
> 
> %prep
>-
>-%setup -q -n %{pypi_name}-%{version}
>+%setup -qn %{git_name}-%{commit}
> # Remove bundled egg-info
>-rm -rf %{pypi_name}.egg-info
>+rm -rf %{git_name}.egg-info
> 
> %if 0%{?with_python3}
> rm -rf %{py3dir}
>@@ -68,10 +85,14 @@
> 
> %build
> %{__python2} setup.py build
>+make -C docs html
>+rm -rf docs/_build/html/.buildinfo
> 
> %if 0%{?with_python3}
> pushd %{py3dir}
> %{__python3} setup.py build
>+make -C docs html
>+rm -rf docs/_build/html/.buildinfo
> popd
> %endif # with_python3
> 
>@@ -84,16 +105,39 @@
> popd
> %endif # with_python3
> 
>+%check
>+rm -rf maxmind-geoip-samples.tar.gz tests/data
>+mkdir -p tests/data
>+tar -zxf %{SOURCE1} -C tests
>+# Test with the only available python env in Fedora
>+sed -i -e 's/$envlist = $$.*$$/\1py27,py34/g' tox.ini
>+tox
>+
>+%if 0%{?with_python3}
>+pushd %{py3dir}
>+rm -rf maxmind-geoip-samples.tar.gz tests/data
>+mkdir -p tests/data
>+tar -zxf %{SOURCE1} -C tests
>+# Test with the only available python env in Fedora
>+sed -i -e 's/$envlist = $$.*$$/\1py27,py34/g' tox.ini
>+tox
>+popd
>+%endif # with_python3
>+
> %files
> %doc README.rst LICENSE.md CHANGELOG.md DEVELOPER.md
>-%{python2_sitelib}/%{pypi_name}
>-%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
>+%{python2_sitelib}/*
>+
>+%files doc
>+%doc docs/_build/html
> 
> %if 0%{?with_python3}
>-%files -n python3-%{pypi_name}
>+%files -n python3-%{git_name}
> %doc README.rst LICENSE.md CHANGELOG.md DEVELOPER.md
>-%{python3_sitelib}/%{pypi_name}
>-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
>+%{python3_sitelib}/*
>+
>+%files -n python3-%{git_name}-doc
>+%doc docs/_build/html
> %endif # with_python3
> 
> %changelog

Actions: View | Diff

Attachments on bug 1155400: 951665 | 951896