From 4087e03b574be08701c89c0a3d25bbdcd897d6172f2cd1396f77ae80c7bbc27c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 13:35:16 +0000 Subject: [PATCH 1/3] Remove superfluous devel dependency for noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Jinja2?expand=0&rev=59 --- python-Jinja2.changes | 5 +++++ python-Jinja2.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-Jinja2.changes b/python-Jinja2.changes index 7e80365..9118317 100644 --- a/python-Jinja2.changes +++ b/python-Jinja2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 12:49:28 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Tue Mar 6 15:52:17 UTC 2018 - aplanas@suse.com diff --git a/python-Jinja2.spec b/python-Jinja2.spec index 02c04d5..7241088 100644 --- a/python-Jinja2.spec +++ b/python-Jinja2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,7 +27,6 @@ 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-rpm-macros From 4df1d45015992a2df67f902eaa8291e2251c2179ee5c16ad7eb70653250787cb Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 17:15:42 +0000 Subject: [PATCH 2/3] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Jinja2?expand=0&rev=60 --- python-Jinja2.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/python-Jinja2.spec b/python-Jinja2.spec index 7241088..5910156 100644 --- a/python-Jinja2.spec +++ b/python-Jinja2.spec @@ -24,21 +24,19 @@ 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/ +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 setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-Babel >= 0.8 +Requires: python-MarkupSafe >= 0.23 +BuildArch: noarch %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 -BuildArch: noarch - %python_subpackages %description @@ -96,20 +94,18 @@ install -Dm644 ext/jinja.el %{buildroot}%{_datadir}/emacs/site-lisp/jinja.el # I %endif %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS README.rst CHANGES.rst LICENSE artwork examples +%license LICENSE +%doc AUTHORS README.rst CHANGES.rst artwork examples %{python_sitelib}/jinja2 %{python_sitelib}/Jinja2-%{version}-py%{python_version}.egg-info %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 -n python-Jinja2-emacs -%defattr(-,root,root,-) %{_datadir}/emacs/site-lisp/jinja.el %changelog From 6fd4ec8a400dc56f6df9b3a164f2a661e534085a29053b3e954750bcf876030f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Dec 2018 12:43:13 +0000 Subject: [PATCH 3/3] - Fix fdupes call OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Jinja2?expand=0&rev=61 --- python-Jinja2.changes | 5 +++++ python-Jinja2.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-Jinja2.changes b/python-Jinja2.changes index 9118317..77d8a8a 100644 --- a/python-Jinja2.changes +++ b/python-Jinja2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 10 12:43:01 UTC 2018 - Tomáš Chvátal + +- Fix fdupes call + ------------------------------------------------------------------- Tue Dec 4 12:49:28 UTC 2018 - Matej Cepl diff --git a/python-Jinja2.spec b/python-Jinja2.spec index 5910156..4151fe8 100644 --- a/python-Jinja2.spec +++ b/python-Jinja2.spec @@ -90,7 +90,7 @@ sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding 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} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %endif %files %{python_files}