Attachment 886492 Details for Bug 1087885 – reference jinja2-26 at runtime

[patch] reference jinja2-26 at runtime

flask-jinja2-26.patch (text/plain), 3.23 KB, created by Pádraig Brady on 2014-04-15 14:06:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2014-04-15 14:06:28 UTC

Size: 3.23 KB

patch

obsolete

>From 1feebdfddb6fe4626cdc6c2c0cff9ff6d9f29c2e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
>Date: Tue, 15 Apr 2014 14:57:20 +0100
>Subject: [PATCH] fix runtime reference to parallel installed python-jinja2-26
>
>Resolves: rhbz#1087885
>---
> jinja2-26.patch   |   31 +++++++++++++++++++++++++++++++
> python-flask.spec |   10 +++++++++-
> 2 files changed, 40 insertions(+), 1 deletions(-)
> create mode 100644 jinja2-26.patch
>
>diff --git a/jinja2-26.patch b/jinja2-26.patch
>new file mode 100644
>index 0000000..4752aaa
>--- /dev/null
>+++ b/jinja2-26.patch
>@@ -0,0 +1,31 @@
>+diff -Naur Flask-0.9.orig/flask/__init__.py Flask-0.9/flask/__init__.py
>+--- Flask-0.9.orig/flask/__init__.py	2012-07-01 11:10:45.000000000 +0000
>++++ Flask-0.9/flask/__init__.py	2014-04-15 13:51:47.911407327 +0000
>+@@ -10,6 +10,27 @@
>+     :license: BSD, see LICENSE for more details.
>+ """
>+ 
>++import sys
>++import pkg_resources
>++
>++# If there is a conflicting non egg module,
>++# i.e. an older standard system module installed,
>++# then replace it with this requirement
>++def replace_dist(requirement):
>++    try:
>++        return pkg_resources.require(requirement)
>++    except pkg_resources.VersionConflict:
>++        e = sys.exc_info()[1]
>++        dist=e.args[0]
>++        req=e.args[1]
>++        if dist.key == req.key and not dist.location.endswith('.egg'):
>++            del pkg_resources.working_set.by_key[dist.key]
>++            # We assume there is no need to adjust sys.path
>++            # and the associated pkg_resources.working_set.entries
>++            return pkg_resources.require(requirement)
>++
>++replace_dist("Jinja2 >= 2.4")
>++
>+ __version__ = '0.9'
>+ 
>+ # utilities we import from Werkzeug and Jinja2 that are unused
>diff --git a/python-flask.spec b/python-flask.spec
>index 142f190..783deb2 100644
>--- a/python-flask.spec
>+++ b/python-flask.spec
>@@ -3,7 +3,7 @@
> 
> Name:           python-flask
> Version:        0.9
>-Release:        7%{?dist}
>+Release:        8%{?dist}
> Epoch:          1
> Summary:        A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions
> 
>@@ -11,6 +11,7 @@ Group:          Development/Libraries
> License:        BSD
> URL:            http://flask.pocoo.org/
> Source0:        http://pypi.python.org/packages/source/F/Flask/%{srcname}-%{srcversion}.tar.gz
>+Patch0:         jinja2-26.patch
> 
> BuildArch:      noarch
> BuildRequires:  python2-devel python-setuptools-devel python-werkzeug python-sphinx
>@@ -19,6 +20,8 @@ Requires:       python-werkzeug
> %if 0%{?rhel}
> BuildRequires:  python-jinja2-26
> Requires:       python-jinja2-26
>+BuildRequires:  python-setuptools
>+Requires:       python-setuptools
> %else
> BuildRequires:  python-jinja2
> Requires:       python-jinja2
>@@ -51,6 +54,8 @@ Documentation and examples for %{name}.
> %setup -q -n %{srcname}-%{srcversion}
> %{__sed} -i "1i __requires__ = ['Jinja2>=2.4']" setup.py
> 
>+%patch0 -p1
>+
> %build
> %{__python} setup.py build
> 
>@@ -84,6 +89,9 @@ rm -rf examples/jqueryexample/*.pyc
> %doc docs/_build/html examples
> 
> %changelog
>+* Tue Apr 15 2014 PÃ¡draig Brady <pbrady@redhat.com> - 1:0.9-8
>+- fix runtime reference to python-jinja2-26 (rhbz#1087885)
>+
> * Mon Jul 29 2013 HaÃ¯kel GuÃ©mar <hguemar@fedoraproject.org> - 1:0.9-7
> - fix wrong requires on sphinx (RHBZ #989361)
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 1087885: 886492