From cd3a68f1c93a92f01875b47ed28f9c85fb0cd1b9 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Oct 18 2016 20:59:04 +0000 Subject: Update to latest git snapshot --- diff --git a/.gitignore b/.gitignore index b1463a1..bfb1618 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /deap-a4dc752.tar.gz +/deap-232ed17.tar.gz diff --git a/python-deap.spec b/python-deap.spec index 4d87ee1..ee39b39 100644 --- a/python-deap.spec +++ b/python-deap.spec @@ -1,11 +1,11 @@ -%global commit a4dc75208662ce40158ba0c9eb0045d0bcc66d70 +%global commit 232ed17142da1c8bb6a39179018f8278b122aada %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20160402 +%global date 20160624 Name: python-deap -Version: 1.1.10 -Release: 0.%{date}git%{shortcommit}%{?dist} +Version: 1.0.1 +Release: 1.%{date}git%{shortcommit}%{?dist} Summary: Distributed Evolutionary Algorithms in Python License: LGPLv3 @@ -18,10 +18,14 @@ BuildRequires: python2-pypandoc BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-sphinx +BuildRequires: python3-pypandoc # documentation +%if 0%{?fedora} >= 24 +BuildRequires: python2-sphinx +%else BuildRequires: python-sphinx +%endif BuildRequires: texlive-scheme-basic BuildRequires: texlive-ucs BuildRequires: numpy @@ -63,9 +67,14 @@ sed -i 's/\["git", "rev-parse", "HEAD"\]/["echo", "deap-%{version}-%{release}"]/ %py2_build %py3_build # generate html docs -sphinx-build doc html +%if 0%{?fedora} >= 24 +PYTHONPATH=$(echo build/lib.linux-*-%{python_version}/) sphinx-build-2 doc build/html +%else +PYTHONPATH=$(echo build/lib.linux-*-%{python_version}/) sphinx-build doc build/html +%endif + # remove the sphinx-build leftovers -rm -rf html/.{doctrees,buildinfo} +rm -rf build/html/.{doctrees,buildinfo} %global _docdir_fmt %{name} @@ -87,8 +96,17 @@ rm -rf html/.{doctrees,buildinfo} %files -n python-deap-doc %license LICENSE.txt -%doc html +%doc build/html %changelog +* Tue Oct 18 2016 Zbigniew Jędrzejewski-Szmek - 1.0.1-1.20160624git232ed17 +- Update to latest git snapshot +- The version was wrong (upstream never released anything after + 1.0.1). I forgot to actually create an update with the initial + version of this package. Luckily, this package was only built in + F22-24, and failed to build in rawhide, so it was never possible to + install it from repositories. I think this means it is possible to + lower the version without bumping the epoch. + * Thu Apr 07 2016 Zbigniew Jędrzejewski-Szmek - 1.1.10-0.20160402gita4dc752 - Initial package. diff --git a/sources b/sources index f8025f9..ef4310a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72801a262c853ad886c3bd2c9c12cda5 deap-a4dc752.tar.gz +2d0548dabd9546cab4440db97bfa09d8 deap-232ed17.tar.gz