diff --git a/.gitignore b/.gitignore index 3906db6..beac2f3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pelican-3.5.0.tar.gz /pelican-3.6.0.tar.gz /pelican-3.6.3.tar.gz +/pelican-3.7.0.tar.gz diff --git a/pelican-3.7.0-fix-changelog.patch b/pelican-3.7.0-fix-changelog.patch new file mode 100644 index 0000000..5c9548d --- /dev/null +++ b/pelican-3.7.0-fix-changelog.patch @@ -0,0 +1,24 @@ +From 01d536d7c9ddd6e1090d69b5f4445e37d4019d40 Mon Sep 17 00:00:00 2001 +From: Justin Mayer +Date: Sat, 31 Dec 2016 15:10:46 -0800 +Subject: [PATCH] Replace m-dash with semi-colon in changelog + +Stop-gap measure to address: +https://github.com/getpelican/pelican/commit/e3ab685a26b3dd2d198319b625d380c4f80afbf7#commitcomment-20333961 +--- + docs/changelog.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/changelog.rst b/docs/changelog.rst +index 3186835..1956e47 100644 +--- a/docs/changelog.rst ++++ b/docs/changelog.rst +@@ -14,7 +14,7 @@ Next release + ```` for modifications + * Simplify Atom feed ID generation and support URL fragments + * Produce category feeds with category-specific titles +-* RSS feeds now default to summary instead of full content — ++* RSS feeds now default to summary instead of full content; + set ``RSS_FEED_SUMMARY_ONLY = False`` to revert to previous behavior + * Replace ``MD_EXTENSIONS`` with ``MARKDOWN`` setting + * Replace ``JINJA_EXTENSIONS`` with more-robust ``JINJA_ENVIRONMENT`` setting diff --git a/python-pelican.spec b/python-pelican.spec index cd4c022..5036094 100644 --- a/python-pelican.spec +++ b/python-pelican.spec @@ -5,14 +5,18 @@ %global pypi_name pelican %{!?__python2:%global __python2 %{__python}} Name: python-%{pypi_name} -Version: 3.6.3 -Release: 7%{?dist} +Version: 3.7.0 +Release: 1%{?dist} Summary: A tool to generate a static blog from reStructuredText or Markdown input files License: AGPLv3 URL: http://getpelican.com Source0: https://github.com/getpelican/pelican/archive/%{version}.tar.gz#/%{pypi_name}-%{version}.tar.gz +# patch to address utf8 issue in changelog +# https://github.com/getpelican/pelican/commit/01d536d7c9ddd6e1090d69b5f4445e37d4019d40.patch +Patch0: pelican-3.7.0-fix-changelog.patch + BuildArch: noarch %description @@ -107,7 +111,7 @@ Pelican is a static site generator, written in Python_. %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n %{pypi_name}-%{version} # make file not zero length to silence rpmlint echo " " > pelican/themes/simple/templates/tag.html @@ -126,7 +130,7 @@ sed -i "s|'pytz >= 0a'|'pytz'|" setup.py %py2_build # build docs -sphinx-build docs html +PYTHONPATH=.:$PYTHONPATH sphinx-build docs html # remove leftovers from sphinxbuild rm html/_downloads/theme-basic.zip html/_static/theme-basic.zip @@ -154,7 +158,7 @@ mv %{buildroot}/%{_bindir}/pelican-themes %{buildroot}/%{_bindir}/pelican-themes # disable tests for now. they are a bit unstable due comparing # html attributes via diff. Failed several times, when attributes # were ordered differently! -#nosetests -sv --with-coverage --cover-package=pelican pelican +# nosetests -sv --with-coverage --cover-package=pelican pelican %files -n python2-%{pypi_name} %doc html README.rst @@ -181,6 +185,9 @@ mv %{buildroot}/%{_bindir}/pelican-themes %{buildroot}/%{_bindir}/pelican-themes %changelog +* Tue Jan 03 2017 Matthias Runge - 3.7.0-1 +- update to 3.7.0 + * Mon Dec 19 2016 Miro Hrončok - 3.6.3-7 - Rebuild for Python 3.6 diff --git a/sources b/sources index acab593..c4b1300 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efa618347c910d2594e8c1521ccf4458 pelican-3.6.3.tar.gz +SHA512 (pelican-3.7.0.tar.gz) = e4b8a771737a8f6fab109b0f4544229f09141f38210b502f605ae449be7ba12bb43db6637592d2e9060255e923f092c6cfe8dc7bbeec1431d5b625f3a9b8222d