diff --git a/.gitignore b/.gitignore index 58eb505..5c9d747 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /khal-0.5.0.tar.gz /khal-0.6.0.tar.gz /khal-0.7.0.tar.gz +/khal-0.8.2.tar.gz diff --git a/khal-0.8.2-sphinx-docfix.patch b/khal-0.8.2-sphinx-docfix.patch new file mode 100644 index 0000000..829cde6 --- /dev/null +++ b/khal-0.8.2-sphinx-docfix.patch @@ -0,0 +1,21 @@ +diff -up khal-0.8.2/doc/source/conf.py.doc khal-0.8.2/doc/source/conf.py +--- khal-0.8.2/doc/source/conf.py.doc 2016-05-15 23:50:18.000000000 +0200 ++++ khal-0.8.2/doc/source/conf.py 2016-05-22 21:39:14.443637245 +0200 +@@ -31,7 +31,7 @@ extensions = [ + 'sphinx.ext.autodoc', + 'sphinx.ext.intersphinx', + 'sphinx.ext.todo', +- 'sphinxcontrib.newsfeed', ++# 'sphinxcontrib.newsfeed', + ] + + # Add any paths that contain templates here, relative to this directory. +diff -up khal-0.8.2/doc/source/Makefile.doc khal-0.8.2/doc/source/Makefile +--- khal-0.8.2/doc/source/Makefile.doc 2016-05-22 21:39:30.997673163 +0200 ++++ khal-0.8.2/doc/source/Makefile 2016-05-22 21:39:36.106684249 +0200 +@@ -1,4 +1,4 @@ + configspec.rst: ../../khal/settings/khal.spec generate_config.py +- python generate_config.py > configspec.rst ++ python3 generate_config.py > configspec.rst + + .PHONY: configspec.rst diff --git a/khal.spec b/khal.spec index aaee5f9..4113e62 100644 --- a/khal.spec +++ b/khal.spec @@ -3,17 +3,17 @@ %bcond_with tests Name: khal -Version: 0.7.0 -Release: 4%{?git_tag}%{?dist} +Version: 0.8.2 +Release: 1%{?git_tag}%{?dist} Summary: CLI calendar application License: MIT URL: https://github.com/pimutils/%{name} -Source0: https://pypi.python.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/11/41/e1610f6575ac33e0f3783f15a60dff4d107cb2efdefe01b422486c91d823/%{name}-%{version}.tar.gz # In theory documentation requires sphinxcontrib.newsfeed to generate # a blog of the changelog. We only need the manpage. We also fix a Makefile error # which happens when using .tar.gz -Patch0: khal-0.7.0-man.patch +Patch0: khal-0.8.2-sphinx-docfix.patch Patch1: khal-0.7.0-no-scm.patch Patch2: khal-0.7.0-py3-doc.patch BuildArch: noarch @@ -40,9 +40,9 @@ calendars with a variety of other programs on a host of different platforms. %prep %setup -q -%patch0 -p1 -b .man -%patch1 -p1 -b .no-scm -%patch2 -p1 -b .py3 +%patch0 -p1 -b .doc +#%patch1 -p1 -b .no-scm +#%patch2 -p1 -b .py3 %build %{__python3} setup.py build @@ -75,6 +75,9 @@ tox -e py27 %{_mandir}/man1/%{name}.1.* %changelog +* Sun May 22 2016 Michele Baldessari - 0.8.2-1 +- New upstream + * Sat Apr 02 2016 Michele Baldessari - 0.7.0-4 - Bump build to keep rawhide > f24 diff --git a/sources b/sources index 8385344..f65996d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96965b2065070be5232042ce5de56c74 khal-0.7.0.tar.gz +8ea853d8d24086dfcc072fce3733185b khal-0.8.2.tar.gz