[packages/python-jinja2] - updated to 2.8 - removed outdated docs patch

qboosh qboosh at pld-linux.org
Tue Dec 1 16:52:24 CET 2015


commit 1137328cf0de8eeeb3fcbbc88dda36c98f884206
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Dec 1 16:52:28 2015 +0100

    - updated to 2.8
    - removed outdated docs patch

 python-jinja2-docs.patch | 11 -----------
 python-jinja2.spec       | 20 +++++++++-----------
 2 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/python-jinja2.spec b/python-jinja2.spec
index fc74ee0..dbc7661 100644
--- a/python-jinja2.spec
+++ b/python-jinja2.spec
@@ -8,30 +8,29 @@
 Summary:	Jinja2 Template engine for Python 2.x
 Summary(pl.UTF-8):	Silnik szablonów Jinja2 dla Pythona 2.x
 Name:		python-%{module}
-Version:	2.7.3
-Release:	5
+Version:	2.8
+Release:	1
 License:	BSD
 Group:		Development/Languages/Python
 Source0:	https://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-# Source0-md5:	b9dffd2f3b43d673802fe857c8445b1a
-Patch0:		%{name}-docs.patch
+# Source0-md5:	edb51693fe22c53cee5403775c71a99e
 URL:		http://jinja.pocoo.org/
 BuildRequires:	rpmbuild(macros) >= 1.710
 BuildRequires:	rpm-pythonprov
 %if %{with python2}
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	python-setuptools
 %endif
 %if %{with python3}
-BuildRequires:	python3-devel
+BuildRequires:	python3-devel >= 1:3.3
+BuildRequires:	python3-modules >= 1:3.3
 BuildRequires:	python3-setuptools
-BuildRequires:	python3-modules
 %endif
 %if %{with doc}
 BuildRequires:	sphinx-pdg
 %endif
 Requires:	python-markupsafe
-Requires:	python-modules
+Requires:	python-modules >= 1:2.6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,7 +50,7 @@ Summary:	Template engine Jinja2 for Python 3.x
 Summary(pl.UTF-8):	Silnik szablonów Jinja2 dla Pythona 3.x
 Group:		Development/Languages/Python
 Requires:	python3-markupsafe
-Requires:	python3-modules
+Requires:	python3-modules >= 1:3.3
 
 %description -n python3-%{module}
 A small but fast and easy to use stand-alone template engine written
@@ -77,7 +76,6 @@ Dokumentacja API silnika szablonów Jinja2.
 
 %prep
 %setup -q -n Jinja2-%{version}
-%patch0 -p1
 
 %build
 %if %{with python2}
@@ -90,7 +88,7 @@ Dokumentacja API silnika szablonów Jinja2.
 %if %{with doc}
 cd docs
 %{__make} -j1 html
-rm -rf _build/html/_sources
+%{__rm} -r _build/html/_sources
 %endif
 
 %install
diff --git a/python-jinja2-docs.patch b/python-jinja2-docs.patch
deleted file mode 100644
index 0300264..0000000
--- a/python-jinja2-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Jinja2-2.7.2/docs/jinjaext.py.orig	2014-01-10 11:14:43.000000000 +0100
-+++ Jinja2-2.7.2/docs/jinjaext.py	2014-01-28 16:34:30.621212862 +0100
-@@ -23,7 +23,7 @@
- from pygments.token import Keyword, Name, Comment, String, Error, \
-      Number, Operator, Generic
- from jinja2 import Environment, FileSystemLoader
--from jinja2.utils import next
-+from jinja2._compat import next
- 
- 
- def parse_rst(state, content_offset, doc):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-jinja2.git/commitdiff/1137328cf0de8eeeb3fcbbc88dda36c98f884206



More information about the pld-cvs-commit mailing list