diff --git a/.gitignore b/.gitignore index b1880e2..46308fd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /v7.3.0.tar.gz /nikola-d956c31576e1fc9a40e584bfe79906128e371835.tar.gz upstream +/v7.6.4.tar.gz diff --git a/python-nikola.spec b/python-nikola.spec index 50cb676..3705a10 100644 --- a/python-nikola.spec +++ b/python-nikola.spec @@ -1,18 +1,19 @@ %global with_python3 1 + %global commit d956c31576e1fc9a40e584bfe79906128e371835 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: python-nikola -Version: 7.3.1 -Release: 3%{?dist} +Version: 7.6.4 +Release: 1%{?dist} Summary: A static website and blog generator License: MIT URL: http://getnikola.com -Source0: https://github.com/getnikola/nikola/archive/%{commit}/nikola-%{commit}.tar.gz +Source0: https://github.com/getnikola/nikola/archive/v%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: python-doit >= 0.23.0 +Requires: python-doit >= 0.28.0 Requires: python-pygments >= 1.6 Requires: python-pillow >= 2.4.0 Requires: python-dateutil >= 2.4.1 @@ -20,11 +21,12 @@ Requires: python-docutils >= 0.12 Requires: python-mako >= 1.0.0 Requires: python-unidecode >= 0.04.16 Requires: python-lxml >= 3.3.5 -Requires: python-yapsy >= 1.10.423 +Requires: python-yapsy >= 1.11.223 Requires: python-PyRSS2Gen >= 1.1 Requires: python-logbook >= 0.7.0 Requires: python-blinker >= 1.3 Requires: python-natsort >= 3.5.2 +Requires: python-requests >= 2.2.0 Requires: glyphicons-halflings-fonts %description @@ -39,29 +41,18 @@ Summary: Extra functionality for python-nikola Requires: python-nikola Requires: python-requests >= 2.2.0 Requires: python-markdown >= 2.4.0 - -#Requires: python-livereload >= 2.3.1 -# https://bugzilla.redhat.com/show_bug.cgi?id=1030755 - Requires: python-jinja2 >= 2.7.2 Requires: python-pyphen >= 0.9.1 - +Requires: python-pygal >= 1.6.1 +Requires: python-webassets >= 0.10.1 +Requires: python-ipython-notebook >= 1.2.1 +Requires: python-watchdog >= 0.8.2 #Requires: python-micawber # https://bugzilla.redhat.com/show_bug.cgi?id=1030968 - -Requires: python-pygal >= 1.6.1 -#https://bugzilla.redhat.com/show_bug.cgi?id=1167733 - #Requires: python-typogrify >= 2.0.4 # https://github.com/mintchaos/typogrify - #Requires: python-phpserialize >= 1.3 # https://github.com/mitsuhiko/phpserialize - -Requires: python-webassets >= 0.10.1 -# webassets bump pending, https://bugzilla.redhat.com/show_bug.cgi?id=1142514 -Requires: python-ipython >= 1.2.1 - #Requires: python-ghp-import >= 0.4.1 %description -n python-nikola-extras @@ -87,6 +78,7 @@ Requires: python3-PyRSS2Gen >= 1.1 Requires: python3-logbook >= 0.7.0 Requires: python3-blinker >= 1.3 Requires: python3-natsort >= 3.5.2 +Requires: python3-requests >= 2.2.0 Requires: glyphicons-halflings-fonts %description -n python3-nikola Nikola is a static site and blog generator using Python. It generates sites @@ -98,18 +90,15 @@ It also automatically builds image galleries. Summary: Extra functionality for python3-nikola #begin optional dependencies Requires: python3-nikola +Requires: python3-nikola Requires: python3-requests >= 2.2.0 Requires: python3-markdown >= 2.4.0 -#Requires: python3-livereload >= 2.3.1 Requires: python3-jinja2 >= 2.7.2 Requires: python3-pyphen >= 0.9.1 -#Requires: python3-micawber >= 0.3.0 -Requires: python3-pygal >= 1.5.1 -#Requires: python2-typogrify >= 2.0.4 -#Requires: python3-phpserialize >= 1.3 -Requires: python3-webassets >= 0.10.1 -Requires: python3-ipython >= 1.2.1 -#Requires: python3-ghp-import >= 0.4.1 +Requires: python3-pygal >= 1.6.1 +Requires: python3-webassets >= 0.10.1 +Requires: python3-ipython-notebook >= 1.2.1 +Requires: python3-watchdog >= 0.8.2 %description -n python3-nikola-extras This package adds optional dependencies for python3-nikola, @@ -126,7 +115,7 @@ python-nikola-doc contains detailed usage instructions for Nikola, a static website and blog generator in python. %prep -%setup -qn nikola-%{commit} +%setup -qn nikola-%{version} sed -i -e 's/^setuptools>=5.4.1/setuptools/' requirements.txt %build @@ -198,6 +187,9 @@ ln -s %{_mandir}/man1/nikola%{python2_version}.1.gz %{buildroot}/%{_mandir}/man1 %doc README.extras %changelog +* Wed Aug 26 2015 Pete Travis - 7.6.4 +- Bump to latest upstream, info at https://github.com/getnikola/nikola/releases/tag/v7.6.4 + * Thu Jun 18 2015 Fedora Release Engineering - 7.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index c3c8387..82dcd05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7ecfdab969556b66086a56f97aa7cec nikola-d956c31576e1fc9a40e584bfe79906128e371835.tar.gz +a407fa1da458f87c1234d446bbc0fd3d v7.6.4.tar.gz