Attachment 951665 Details for Bug 1155400 – Patch proposition for the spec file

[patch] Patch proposition for the spec file

specfile_001.patch (text/plain), 3.21 KB, created by nicolas.vieville on 2014-10-29 08:50:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nicolas.vieville

Created: 2014-10-29 08:50:52 UTC

Size: 3.21 KB

patch

obsolete

>--- python-pygeoip.orig.spec	2014-10-29 08:27:09.378715765 +0100
>+++ python-pygeoip.spec	2014-10-29 09:09:20.470295041 +0100
>@@ -1,4 +1,4 @@
>-%if 0%{?fedora} > 12
>+%if 0%{?fedora}
> %global with_python3 1
> %else
> %{!?__python2: %global __python2 /usr/bin/python2}
>@@ -7,34 +7,29 @@
> 
> %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
>+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
>+Source1:            https://www.defunct.cc/maxmind-geoip-samples.tar.gz
>+
>+Group:              Development/Libraries
>+BuildArch:          noarch
>+BuildRequires:      python2-devel
>+BuildRequires:      python-setuptools
>+BuildRequires:      python-nose
>+BuildRequires:      python-tox
>+Requires:           GeoIP
>+
>+%if 0%{?with_python3}
>+BuildRequires:      python3-setuptools
>+BuildRequires:      python3-devel
>+BuildRequires:      python3-nose
>+BuildRequires:      python-tox
>+Requires: GeoIP
> %endif # if with_python3
> 
> %description
>@@ -56,7 +51,6 @@
> %endif # if with_python3
> 
> %prep
>-
> %setup -q -n %{pypi_name}-%{version}
> # Remove bundled egg-info
> rm -rf %{pypi_name}.egg-info
>@@ -84,16 +78,33 @@
> 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}/*
> 
> %if 0%{?with_python3}
> %files -n python3-%{pypi_name}
> %doc README.rst LICENSE.md CHANGELOG.md DEVELOPER.md
>-%{python3_sitelib}/%{pypi_name}
>-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
>+%{python3_sitelib}/*
> %endif # with_python3
> 
> %changelog

Actions: View | Diff

Attachments on bug 1155400: 951665 | 951896