From cd973b9dd1ffee4822120f35880e93fa2ff40c8f19f2a8f4a8f4747d8246b49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Apr 2015 07:25:30 +0000 Subject: [PATCH 1/3] Accepting request 304085 from home:benoit_monin:branches:devel:languages:python - update to version 0.12.8: no upstream changelog - update bottle-docs.pdf - point the source URL of the pdf to the project homepage - create of separate subpackage for the pdf documentation OBS-URL: https://build.opensuse.org/request/show/304085 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bottle?expand=0&rev=18 --- bottle-0.12.7.tar.gz | 3 --- bottle-0.12.8.tar.gz | 3 +++ bottle-docs.pdf | 4 ++-- python-bottle.changes | 8 ++++++++ python-bottle.spec | 32 ++++++++++++++++++++++++++++---- 5 files changed, 41 insertions(+), 9 deletions(-) delete mode 100644 bottle-0.12.7.tar.gz create mode 100644 bottle-0.12.8.tar.gz diff --git a/bottle-0.12.7.tar.gz b/bottle-0.12.7.tar.gz deleted file mode 100644 index cb51022..0000000 --- a/bottle-0.12.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 -size 69375 diff --git a/bottle-0.12.8.tar.gz b/bottle-0.12.8.tar.gz new file mode 100644 index 0000000..a7347ac --- /dev/null +++ b/bottle-0.12.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd5d1755a85e533205ed8a2465badf38602227c5f171c3852e07724b28c050ac +size 69414 diff --git a/bottle-docs.pdf b/bottle-docs.pdf index 386e93d..d00919a 100644 --- a/bottle-docs.pdf +++ b/bottle-docs.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10d86c8a74040a2120d91970909751a2cc76e6e6b172fd5507920bb206343595 -size 633122 +oid sha256:1663da6e7b615348fee983bf3b9becce7043d68d44de59d6dfac5adabf79febe +size 633118 diff --git a/python-bottle.changes b/python-bottle.changes index 126e417..8840637 100644 --- a/python-bottle.changes +++ b/python-bottle.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 26 18:21:13 UTC 2015 - benoit.monin@gmx.fr + +- update to version 0.12.8: no upstream changelog +- update bottle-docs.pdf +- point the source URL of the pdf to the project homepage +- create of separate subpackage for the pdf documentation + ------------------------------------------------------------------- Tue May 20 12:20:37 UTC 2014 - toddrme2178@gmail.com diff --git a/python-bottle.spec b/python-bottle.spec index 98bcfe0..aba990c 100644 --- a/python-bottle.spec +++ b/python-bottle.spec @@ -1,7 +1,7 @@ # # spec file for package python-bottle # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: python-bottle -Version: 0.12.7 +Version: 0.12.8 Release: 0 Url: http://bottlepy.org/ Summary: Fast and simple WSGI-framework for small web-applications License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/b/bottle/bottle-%{version}.tar.gz -Source1: bottle-docs.pdf +Source1: http://bottlepy.org/docs/0.12/bottle-docs.pdf BuildRequires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -40,6 +40,20 @@ built-in HTTP Server and adapters for many third party WSGI/HTTP-server and template engines. All in a single file and with no dependencies other than the Python Standard Library. +%package doc +Summary: Documentation for %{name} +Group: Documentation/Other +Requires: %{name} = %{version} + +%description doc +Bottle is a fast and simple micro-framework for small web-applications. It +offers request dispatching (Routes) with url parameter support, Templates, a +built-in HTTP Server and adapters for many third party WSGI/HTTP-server and +template engines. All in a single file and with no dependencies other than the +Python Standard Library. + +This subpackage contains the PDF documentation for %{name}. + %prep %setup -q -n bottle-%{version} cp %{SOURCE1} . @@ -50,11 +64,21 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# install documentation +mkdir -p %{buildroot}%{_docdir}/%{name} +cp README.rst bottle-docs.pdf %{buildroot}%{_docdir}/%{name} + %files %defattr(-,root,root,-) -%doc README.rst bottle-docs.pdf +%doc %dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/README.rst %{_bindir}/bottle.py %{python_sitelib}/bottle.py* %{python_sitelib}/bottle-%{version}-py%{py_ver}.egg-info +%files doc +%defattr(-,root,root,-) +%doc %dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/bottle-docs.pdf + %changelog From 98078df058a45af78af1421371f538acaafc1e2c4312429b8266b690bdfe9660 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 23 Mar 2017 18:15:03 +0000 Subject: [PATCH 2/3] Accepting request 482346 from devel:languages:python:singlespec - update for singlespec - use automation for docs - update to 0.12.13 * bugfix release * fixed TypeError on unicode WSGI headers * fixed get_header on FileUpload * fixed crlf header injection (CVE-2016-9964) * switch to setuptools for build * allow multiline dict/list/set comprehensions in templates * allow unicode keys in ConfigDict OBS-URL: https://build.opensuse.org/request/show/482346 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bottle?expand=0&rev=19 --- bottle-0.12.13.tar.gz | 3 +++ bottle-0.12.8.tar.gz | 3 --- bottle-docs.pdf | 4 ++-- python-bottle.changes | 14 +++++++++++++ python-bottle.spec | 46 +++++++++++++++++++++---------------------- 5 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 bottle-0.12.13.tar.gz delete mode 100644 bottle-0.12.8.tar.gz diff --git a/bottle-0.12.13.tar.gz b/bottle-0.12.13.tar.gz new file mode 100644 index 0000000..29b7a9c --- /dev/null +++ b/bottle-0.12.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355 +size 70870 diff --git a/bottle-0.12.8.tar.gz b/bottle-0.12.8.tar.gz deleted file mode 100644 index a7347ac..0000000 --- a/bottle-0.12.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd5d1755a85e533205ed8a2465badf38602227c5f171c3852e07724b28c050ac -size 69414 diff --git a/bottle-docs.pdf b/bottle-docs.pdf index d00919a..c40bd97 100644 --- a/bottle-docs.pdf +++ b/bottle-docs.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1663da6e7b615348fee983bf3b9becce7043d68d44de59d6dfac5adabf79febe -size 633118 +oid sha256:5d5d94096379d919a6461f64e0158085865336e5810a5a0c190082017535a92b +size 437934 diff --git a/python-bottle.changes b/python-bottle.changes index 8840637..6c503dd 100644 --- a/python-bottle.changes +++ b/python-bottle.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Mar 23 18:09:54 UTC 2017 - jmatejek@suse.com + +- update for singlespec +- use automation for docs +- update to 0.12.13 + * bugfix release + * fixed TypeError on unicode WSGI headers + * fixed get_header on FileUpload + * fixed crlf header injection (CVE-2016-9964) + * switch to setuptools for build + * allow multiline dict/list/set comprehensions in templates + * allow unicode keys in ConfigDict + ------------------------------------------------------------------- Sun Apr 26 18:21:13 UTC 2015 - benoit.monin@gmx.fr diff --git a/python-bottle.spec b/python-bottle.spec index aba990c..a9fa378 100644 --- a/python-bottle.spec +++ b/python-bottle.spec @@ -1,7 +1,7 @@ # # spec file for package python-bottle # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,22 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-bottle -Version: 0.12.8 +Version: 0.12.13 Release: 0 Url: http://bottlepy.org/ Summary: Fast and simple WSGI-framework for small web-applications License: MIT Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/b/bottle/bottle-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/b/bottle/bottle-%{version}.tar.gz Source1: http://bottlepy.org/docs/0.12/bottle-docs.pdf -BuildRequires: python-base +BuildRequires: %{python_module setuptools} +BuildRequires: python-rpm-macros 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 Bottle is a fast and simple micro-framework for small web-applications. It @@ -40,12 +40,13 @@ built-in HTTP Server and adapters for many third party WSGI/HTTP-server and template engines. All in a single file and with no dependencies other than the Python Standard Library. -%package doc +%package -n %{name}-doc Summary: Documentation for %{name} Group: Documentation/Other Requires: %{name} = %{version} +Provides: %{python_module bottle-doc = %{version}} -%description doc +%description -n %{name}-doc Bottle is a fast and simple micro-framework for small web-applications. It offers request dispatching (Routes) with url parameter support, Templates, a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and @@ -59,26 +60,23 @@ This subpackage contains the PDF documentation for %{name}. cp %{SOURCE1} . %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_clone %{buildroot}%{_bindir}/bottle.py -# install documentation -mkdir -p %{buildroot}%{_docdir}/%{name} -cp README.rst bottle-docs.pdf %{buildroot}%{_docdir}/%{name} - -%files +%files %{python_files} %defattr(-,root,root,-) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/README.rst -%{_bindir}/bottle.py +%doc README.rst +%{_bindir}/bottle.py-%{python_bin_suffix} +%python3_only %{_bindir}/bottle.py %{python_sitelib}/bottle.py* -%{python_sitelib}/bottle-%{version}-py%{py_ver}.egg-info +%pycache_only %{python_sitelib}/__pycache__ +%{python_sitelib}/bottle-%{version}-py%{python_version}.egg-info -%files doc +%files -n %{name}-doc %defattr(-,root,root,-) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/bottle-docs.pdf +%doc bottle-docs.pdf %changelog From 810f9199bd3f21b9037a060f16c3800b23dbcee610f13634aa2ab6c61486ede3 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 29 Mar 2017 15:41:29 +0000 Subject: [PATCH 3/3] Accepting request 483404 from home:TheBlackCat:branches:devel:languages:python update pdf doc file. OBS-URL: https://build.opensuse.org/request/show/483404 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bottle?expand=0&rev=20 --- bottle-docs.pdf | 2 +- python-bottle.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bottle-docs.pdf b/bottle-docs.pdf index c40bd97..fd75c5a 100644 --- a/bottle-docs.pdf +++ b/bottle-docs.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d5d94096379d919a6461f64e0158085865336e5810a5a0c190082017535a92b +oid sha256:7d6780ede6a151443b4c25a20fe601c26b7dc8aff2ec65c13ce929647b6e5260 size 437934 diff --git a/python-bottle.changes b/python-bottle.changes index 6c503dd..e701003 100644 --- a/python-bottle.changes +++ b/python-bottle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 29 15:24:50 UTC 2017 - toddrme2178@gmail.com + +- update pdf doc file. + ------------------------------------------------------------------- Thu Mar 23 18:09:54 UTC 2017 - jmatejek@suse.com