From bb91ae9e770de551b19f3f2b8b84a3ef7ad7540bfa21ccfd8e4b1dc7cfbf9f1c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 25 Apr 2012 08:26:10 +0000 Subject: [PATCH] Accepting request 115191 from home:TheBlackCat:branches:devel:languages:python Please add a link in devel:languages:python from python-Jinja2 to python3-Jinja2 to allow building of the python3 version - Add python 3 package - Simplify vim plugin packaging - Add suggests for vim and emacs in their respective packages - Removed test for obsolete openSUSE version OBS-URL: https://build.opensuse.org/request/show/115191 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Jinja2?expand=0&rev=13 --- python-Jinja2.changes | 9 ++++ python-Jinja2.spec | 7 ++- python3-Jinja2.changes | 8 ++++ python3-Jinja2.spec | 100 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 python3-Jinja2.changes create mode 100644 python3-Jinja2.spec diff --git a/python-Jinja2.changes b/python-Jinja2.changes index 1fdcc83..bd68364 100644 --- a/python-Jinja2.changes +++ b/python-Jinja2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Apr 23 12:00:49 UTC 2012 - toddrme2178@gmail.com + +- Add python 3 package +- Simplify vim plugin packaging +- Add suggests for vim and emacs in their respective + packages +- Removed test for obsolete openSUSE version + ------------------------------------------------------------------- Thu Feb 23 13:44:50 UTC 2012 - saschpe@suse.de diff --git a/python-Jinja2.spec b/python-Jinja2.spec index a8bc7dd..942239e 100644 --- a/python-Jinja2.spec +++ b/python-Jinja2.spec @@ -27,6 +27,7 @@ Source: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-distribute +BuildRequires: vim Provides: python-jinja2 = %{version} Obsoletes: python-jinja2 < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,6 +57,7 @@ Summary: Jinja2 syntax files for Vim License: BSD-3-Clause Group: Productivity/Text/Editors Requires: %{name} = %{version} +Recommends: vim %description vim Vim syntax highlighting scheme for Jinja2 templates. @@ -65,6 +67,7 @@ Summary: Jinja2 syntax files for Emacs License: GPL-2.0+ Group: Productivity/Text/Editors Requires: %{name} = %{version} +Recommends: emacs %description emacs Emacs syntax highlighting scheme for Jinja2 templates. @@ -80,7 +83,7 @@ sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding python setup.py install --prefix=%{_prefix} --root=%{buildroot} 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} > 1010 +%if 0%{?suse_version} %fdupes %{buildroot}%{_prefix} %endif @@ -91,7 +94,7 @@ install -Dm644 ext/jinja.el %{buildroot}%{_datadir}/emacs/site-lisp/jinja.el # I %files vim %defattr(-,root,root,-) -%{_datadir}/vim +%{_datadir}/vim/site/syntax/jinja.vim %files emacs %defattr(-,root,root,-) diff --git a/python3-Jinja2.changes b/python3-Jinja2.changes new file mode 100644 index 0000000..5320190 --- /dev/null +++ b/python3-Jinja2.changes @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 12:00:49 UTC 2012 - toddrme2178@gmail.com + +- Add python 3 package +- Simplify vim plugin packaging +- Add suggests for vim and emacs in their respective + packages +- Removed test for obsolete openSUSE version diff --git a/python3-Jinja2.spec b/python3-Jinja2.spec new file mode 100644 index 0000000..9f9faf6 --- /dev/null +++ b/python3-Jinja2.spec @@ -0,0 +1,100 @@ +# +# spec file for package python3-Jinja2 +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: python3-Jinja2 +Version: 2.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: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz +BuildRequires: fdupes +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-distribute +BuildRequires: vim +Requires: python3 >= %{py3_ver} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%if 0%{?suse_version} <= 1140 +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif + +%description +Jinja2 is a template engine written in pure Python. It provides a Django +inspired non-XML syntax but supports inline expressions and an optional +sandboxed environment. Here a small example of a Jinja template: + + {% extends 'base.html' %} + {% block title %}Memberlist{% endblock %} + {% block content %} + + {% endblock %} + +%package vim +Summary: Jinja2 syntax files for Vim +License: BSD-3-Clause +Group: Productivity/Text/Editors +Requires: %{name} = %{version} +Recommends: vim + +%description vim +Vim syntax highlighting scheme for Jinja2 templates. + +%package emacs +Summary: Jinja2 syntax files for Emacs +License: GPL-2.0+ +Group: Productivity/Text/Editors +Requires: %{name} = %{version} +Recommends: emacs + +%description emacs +Emacs syntax highlighting scheme for Jinja2 templates. + +%prep +%setup -q -n Jinja2-%{version} + +%build +python3 setup.py build +sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding + +%install +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +install -Dm644 ext/Vim/jinja.vim %{buildroot}%{_datadir}/vim/site/syntax/jinja-python%{py3_ver}.vim # Install VIM syntax file +install -Dm644 ext/jinja.el %{buildroot}%{_datadir}/emacs/site-lisp/jinja-python%{py3_ver}.el # Install Emacs syntax file +%fdupes %{buildroot}%{_prefix} + +%files +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE artwork examples ext/JinjaTemplates.tmbundle.tar.gz +%{python3_sitelib}/* + +%files vim +%defattr(-,root,root,-) +%{_datadir}/vim/site/syntax/jinja-python%{py3_ver}.vim + +%files emacs +%defattr(-,root,root,-) +%{_datadir}/emacs/site-lisp/jinja-python%{py3_ver}.el + +%changelog