From 41c8f0a797dff671baa4fd26df2af8dbfd737f7784a07fa056a7168011e09e6e Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Wed, 5 Apr 2017 05:32:48 +0000 Subject: [PATCH] Accepting request 485686 from devel:languages:python:singlespec - update for singlespec - update to 2.9.6 * fixed custom context behavior in fast resolve mode OBS-URL: https://build.opensuse.org/request/show/485686 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Jinja2?expand=0&rev=51 --- Jinja2-2.9.5.tar.gz | 3 --- Jinja2-2.9.6.tar.gz | 3 +++ python-Jinja2.changes | 7 +++++++ python-Jinja2.spec | 45 +++++++++++++++++++++---------------------- 4 files changed, 32 insertions(+), 26 deletions(-) delete mode 100644 Jinja2-2.9.5.tar.gz create mode 100644 Jinja2-2.9.6.tar.gz diff --git a/Jinja2-2.9.5.tar.gz b/Jinja2-2.9.5.tar.gz deleted file mode 100644 index d23267d..0000000 --- a/Jinja2-2.9.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825 -size 437631 diff --git a/Jinja2-2.9.6.tar.gz b/Jinja2-2.9.6.tar.gz new file mode 100644 index 0000000..c107299 --- /dev/null +++ b/Jinja2-2.9.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff +size 437659 diff --git a/python-Jinja2.changes b/python-Jinja2.changes index f6437b6..3413839 100644 --- a/python-Jinja2.changes +++ b/python-Jinja2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 4 14:56:17 UTC 2017 - jmatejek@suse.com + +- update for singlespec +- update to 2.9.6 + * fixed custom context behavior in fast resolve mode + ------------------------------------------------------------------- Wed Mar 22 04:39:40 UTC 2017 - dmueller@suse.com diff --git a/python-Jinja2.spec b/python-Jinja2.spec index 4c49686..b3fa8cf 100644 --- a/python-Jinja2.spec +++ b/python-Jinja2.spec @@ -16,28 +16,31 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-Jinja2 -Version: 2.9.5 +Version: 2.9.6 Release: 0 Summary: A fast and easy to use template engine written in pure Python License: BSD-3-Clause Group: Development/Languages/Python Url: http://jinja.pocoo.org/ Source: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz +BuildRequires: %{python_module MarkupSafe} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: python-MarkupSafe -BuildRequires: python-devel -BuildRequires: python-setuptools -Provides: python-jinja2 = %{version} -Obsoletes: python-jinja2 < %{version} +BuildRequires: python-rpm-macros +%ifpython2 +Provides: %{oldpython}-jinja2 = %{version} +Obsoletes: %{oldpython}-jinja2 < %{version} +%endif Requires: python-Babel >= 0.8 Requires: python-MarkupSafe >= 0.23 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif + +%python_subpackages %description Jinja2 is a template engine written in pure Python. It provides a Django @@ -54,59 +57,55 @@ sandboxed environment. Here a small example of a Jinja template: {% endblock %} -%package vim +%package -n python-Jinja2-vim Summary: Jinja2 syntax files for Vim License: BSD-3-Clause Group: Productivity/Text/Editors Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1010 Recommends: vim -%endif -%description vim +%description -n python-Jinja2-vim Vim syntax highlighting scheme for Jinja2 templates. -%package emacs +%package -n python-Jinja2-emacs Summary: Jinja2 syntax files for Emacs License: GPL-2.0+ Group: Productivity/Text/Editors Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1010 Recommends: emacs -%endif -%description emacs +%description -n python-Jinja2-emacs Emacs syntax highlighting scheme for Jinja2 templates. %prep %setup -q -n Jinja2-%{version} %build -python setup.py build +%python_build sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install install -Dm644 ext/Vim/jinja.vim %{buildroot}%{_datadir}/vim/site/syntax/jinja.vim # Install VIM syntax file install -Dm644 ext/jinja.el %{buildroot}%{_datadir}/emacs/site-lisp/jinja.el # Install Emacs syntax file %if 0%{?suse_version} %fdupes %{buildroot}%{_prefix} %endif -%files +%files %{python_files} %defattr(-,root,root,-) %doc AUTHORS CHANGES LICENSE artwork examples %{python_sitelib}/jinja2 %{python_sitelib}/Jinja2-%{version}-py%{python_version}.egg-info -%files vim +%files -n python-Jinja2-vim %defattr(-,root,root,-) %dir %{_datadir}/vim %dir %{_datadir}/vim/site %dir %{_datadir}/vim/site/syntax %{_datadir}/vim/site/syntax/jinja.vim -%files emacs +%files -n python-Jinja2-emacs %defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/jinja.el