From a9a7c50acd39f3d7bb3d40fac33cc84258403d5a7d0266661d8c1367f00ddc0b Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Sun, 16 Jul 2017 16:30:25 +0000 Subject: [PATCH 1/4] Accepting request 510577 from home:alois:branches:devel:languages:python OBS-URL: https://build.opensuse.org/request/show/510577 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyramid?expand=0&rev=26 --- pyramid-1.6.tar.gz | 3 - pyramid-1.9.1.tar.gz | 3 + python-pyramid.changes | 6 ++ python-pyramid.spec | 179 ++++++++++++++++------------------------- 4 files changed, 78 insertions(+), 113 deletions(-) delete mode 100644 pyramid-1.6.tar.gz create mode 100644 pyramid-1.9.1.tar.gz diff --git a/pyramid-1.6.tar.gz b/pyramid-1.6.tar.gz deleted file mode 100644 index b8c970b..0000000 --- a/pyramid-1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c921291d504ea2815a309632d9fd4a3a5a24dd6b7b5f60ee39c426ab266562de -size 2567399 diff --git a/pyramid-1.9.1.tar.gz b/pyramid-1.9.1.tar.gz new file mode 100644 index 0000000..e4c18cb --- /dev/null +++ b/pyramid-1.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:840f4bbd5994609340de35079da0d1dd94f79942e27818d5d8566f8009fb0b36 +size 2634907 diff --git a/python-pyramid.changes b/python-pyramid.changes index 73147ee..8df4988 100644 --- a/python-pyramid.changes +++ b/python-pyramid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 16 08:31:15 UTC 2017 - aloisio@gmx.com + +- Update to 1.9.1, see HISTORY.txt for (long) changelog +- Converted to single-spec + ------------------------------------------------------------------- Tue Jan 5 18:43:19 UTC 2016 - hpj@urpla.net diff --git a/python-pyramid.spec b/python-pyramid.spec index c280cd1..9beed8a 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -1,8 +1,8 @@ # # spec file for package python-pyramid # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2014-2016 LISA GmbH, Bingen, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,50 +17,53 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyramid -Version: 1.6 +Version: 1.9.1 Release: 0 -Url: http://pylonsproject.org Summary: The Pyramid web application development framework License: BSD-4-Clause and ZPL-2.1 and MIT Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/p/pyramid/pyramid-%{version}.tar.gz +Url: http://pylonsproject.org +Source0: https://files.pythonhosted.org/packages/source/p/pyramid/pyramid-%{version}.tar.gz +BuildRequires: %{python_module PasteDeploy} >= 1.5.0 +BuildRequires: %{python_module WebOb} >= 1.7.0 +BuildRequires: %{python_module repoze.lru} >= 0.4 +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module translationstring} >= 0.4 +BuildRequires: %{python_module venusian} >= 1.0 +BuildRequires: %{python_module zope.deprecation} >= 3.5.0 +BuildRequires: %{python_module zope.interface} >= 3.8.0 +# SECTION documentation requirements +BuildRequires: python3-Sphinx >= 1.3.5 +BuildRequires: python3-docutils +BuildRequires: python3-pylons-sphinx-themes +BuildRequires: python3-repoze.sphinx.autointerface +BuildRequires: python3-sphinxcontrib-autoprogram +# /SECTION +# SECTION testing requirements +BuildRequires: %{python_module WebTest} >= 1.3.1 +BuildRequires: %{python_module coverage} +BuildRequires: %{python_module hupper} +BuildRequires: %{python_module nose} +BuildRequires: %{python_module plaster-pastedeploy} +BuildRequires: %{python_module plaster} +BuildRequires: %{python_module zope.component} >= 4.0 +# /SECTION +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-PasteDeploy >= 1.5.0 -Requires: python-WebOb >= 1.3.1 +Requires: python-WebOb >= 1.7.0 Requires: python-repoze.lru >= 0.4 Requires: python-translationstring >= 0.4 Requires: python-venusian >= 1.0 Requires: python-zope.deprecation >= 3.5.0 Requires: python-zope.interface >= 3.8.0 -BuildRequires: fdupes -BuildRequires: python-PasteDeploy >= 1.5.0 -BuildRequires: python-WebOb >= 1.3.1 -BuildRequires: python-repoze.lru >= 0.4 -BuildRequires: python-setuptools -BuildRequires: python-translationstring >= 0.4 -BuildRequires: python-venusian >= 1.0 -BuildRequires: python-zope.deprecation >= 3.5.0 -BuildRequires: python-zope.interface >= 3.8.0 -# Documentation requirements: -BuildRequires: python-Sphinx -BuildRequires: python-docutils -BuildRequires: python-pylons_sphinx_theme -BuildRequires: python-repoze.sphinx.autointerface -# Testing requirements: -BuildRequires: python-WebTest >= 1.3.1 -BuildRequires: python-coverage -BuildRequires: python-nose -BuildRequires: python-zope.component >= 3.11.0 +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): update-alternatives -Requires(postun): update-alternatives -%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()")} -BuildRequires: python-ordereddict -BuildRequires: python-unittest2 -%else BuildArch: noarch -%endif +%python_subpackages %description Pyramid is a small, fast, down-to-earth, open source Python web application @@ -72,104 +75,60 @@ Pyramid is the newest web framework produced by the Pylons Project Pyramid was previously known as repoze.bfg (http://bfg.repoze.org). -%package doc -Summary: The Pyramid web application development framework -Group: Development/Languages/Python +%package -n %{name}-doc +Summary: Documentation for %{name} +Group: Documentation/HTML Requires: %{name} = %{version} +Provides: %{python_module pyramid-doc = %{version}} -%description doc +%description -n %{name}-doc This package contains documentation files for %{name}. %prep %setup -q -n pyramid-%{version} +# fix inconsistent mtime error +touch -r pyramid/__init__.py pyramid/scaffolds/alchemy/+package+/scripts/__init__.py \ + pyramid/scripts/__init__.py %build -python setup.py build -python setup.py build_sphinx && rm build/sphinx/html/.buildinfo +%python_build +%{_python_use_flavor python3} +%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -rm -rf %{buildroot}%{python_sitelib}/pyramid/tests # Big, hidden files, fdupes -> don't package -%fdupes %{buildroot}%{python_sitelib} +%python_install +%{python_expand rm -rf %{buildroot}%{$python_sitelib}/pyramid/tests + %fdupes %{buildroot}%{$python_sitelib} +} -# move executables to python-specific names -mv %{buildroot}%{_bindir}/pcreate %{buildroot}%{_bindir}/pcreate-%{py_ver} -mv %{buildroot}%{_bindir}/pdistreport %{buildroot}%{_bindir}/pdistreport-%{py_ver} -mv %{buildroot}%{_bindir}/prequest %{buildroot}%{_bindir}/prequest-%{py_ver} -mv %{buildroot}%{_bindir}/proutes %{buildroot}%{_bindir}/proutes-%{py_ver} -mv %{buildroot}%{_bindir}/pserve %{buildroot}%{_bindir}/pserve-%{py_ver} -mv %{buildroot}%{_bindir}/pshell %{buildroot}%{_bindir}/pshell-%{py_ver} -mv %{buildroot}%{_bindir}/ptweens %{buildroot}%{_bindir}/ptweens-%{py_ver} -mv %{buildroot}%{_bindir}/pviews %{buildroot}%{_bindir}/pviews-%{py_ver} - -# Prepare for update-alternatives usage -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/pcreate -touch %{buildroot}%{_sysconfdir}/alternatives/pdistreport -touch %{buildroot}%{_sysconfdir}/alternatives/prequest -touch %{buildroot}%{_sysconfdir}/alternatives/proutes -touch %{buildroot}%{_sysconfdir}/alternatives/pserve -touch %{buildroot}%{_sysconfdir}/alternatives/pshell -touch %{buildroot}%{_sysconfdir}/alternatives/ptweens -touch %{buildroot}%{_sysconfdir}/alternatives/pviews -ln -s -f %{_sysconfdir}/alternatives/pcreate %{buildroot}%{_bindir}/pcreate -ln -s -f %{_sysconfdir}/alternatives/pdistreport %{buildroot}%{_bindir}/pdistreport -ln -s -f %{_sysconfdir}/alternatives/prequest %{buildroot}%{_bindir}/prequest -ln -s -f %{_sysconfdir}/alternatives/proutes %{buildroot}%{_bindir}/proutes -ln -s -f %{_sysconfdir}/alternatives/pserve %{buildroot}%{_bindir}/pserve -ln -s -f %{_sysconfdir}/alternatives/pshell %{buildroot}%{_bindir}/pshell -ln -s -f %{_sysconfdir}/alternatives/ptweens %{buildroot}%{_bindir}/ptweens -ln -s -f %{_sysconfdir}/alternatives/pviews %{buildroot}%{_bindir}/pviews +for p in pcreate pdistreport prequest proutes pserve pshell ptweens pviews; do + %python_clone -a %{buildroot}%{_bindir}/$p +done %check -LANG=en_US.UTF-8 python setup.py nosetests --with-coverage -vvv +export LANG=en_US.UTF-8 +%python_expand $python setup.py nosetests --with-coverage -vvv %post -update-alternatives \ - --install %{_bindir}/pcreate pcreate %{_bindir}/pcreate-%{py_ver} 30 \ - --slave %{_bindir}/pdistreport pdistreport %{_bindir}/pdistreport-%{py_ver} \ - --slave %{_bindir}/prequest prequest %{_bindir}/prequest-%{py_ver} \ - --slave %{_bindir}/proutes proutes %{_bindir}/proutes-%{py_ver} \ - --slave %{_bindir}/pserve pserve %{_bindir}/pserve-%{py_ver} \ - --slave %{_bindir}/pshell pshell %{_bindir}/pshell-%{py_ver} \ - --slave %{_bindir}/ptweens ptweens %{_bindir}/ptweens-%{py_ver} \ - --slave %{_bindir}/pviews pviews %{_bindir}/pviews-%{py_ver} +%python_install_alternative pcreate pdistreport prequest proutes pserve pshell ptweens pviews -%preun -if [ $1 -eq 0 ] ; then - update-alternatives --remove pcreate %{_bindir}/pcreate-%{py_ver} -fi +%postun +%python_uninstall_alternative pcreate -%files +%files %{python_files} %defattr(-,root,root,-) %doc *.txt *.rst -%{_bindir}/pcreate -%{_bindir}/pdistreport -%{_bindir}/prequest -%{_bindir}/proutes -%{_bindir}/pserve -%{_bindir}/pshell -%{_bindir}/ptweens -%{_bindir}/pviews -%{_bindir}/pcreate-%{py_ver} -%{_bindir}/pdistreport-%{py_ver} -%{_bindir}/prequest-%{py_ver} -%{_bindir}/proutes-%{py_ver} -%{_bindir}/pserve-%{py_ver} -%{_bindir}/pshell-%{py_ver} -%{_bindir}/ptweens-%{py_ver} -%{_bindir}/pviews-%{py_ver} -%ghost %{_sysconfdir}/alternatives/pcreate -%ghost %{_sysconfdir}/alternatives/pdistreport -%ghost %{_sysconfdir}/alternatives/prequest -%ghost %{_sysconfdir}/alternatives/proutes -%ghost %{_sysconfdir}/alternatives/pserve -%ghost %{_sysconfdir}/alternatives/pshell -%ghost %{_sysconfdir}/alternatives/ptweens -%ghost %{_sysconfdir}/alternatives/pviews +%python_alternative %{_bindir}/pcreate +%python_alternative %{_bindir}/pdistreport +%python_alternative %{_bindir}/prequest +%python_alternative %{_bindir}/proutes +%python_alternative %{_bindir}/pserve +%python_alternative %{_bindir}/pshell +%python_alternative %{_bindir}/ptweens +%python_alternative %{_bindir}/pviews %{python_sitelib}/* -%files doc +%files -n %{name}-doc %defattr(-,root,root,-) %doc build/sphinx/html From a5d95f693925f9f3388bf597391b7ca243d4f0a546cb126c21bdc8deb26b1fdf Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 8 Aug 2017 16:00:57 +0000 Subject: [PATCH 2/4] Accepting request 515100 from home:jengelh:branches:devel:languages:python - Trim filler wording from description. OBS-URL: https://build.opensuse.org/request/show/515100 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyramid?expand=0&rev=27 --- python-pyramid.changes | 5 +++++ python-pyramid.spec | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python-pyramid.changes b/python-pyramid.changes index 8df4988..64d8dda 100644 --- a/python-pyramid.changes +++ b/python-pyramid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 7 23:22:39 UTC 2017 - jengelh@inai.de + +- Trim filler wording from description. + ------------------------------------------------------------------- Sun Jul 16 08:31:15 UTC 2017 - aloisio@gmx.com diff --git a/python-pyramid.spec b/python-pyramid.spec index 9beed8a..189ba3a 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -66,14 +66,9 @@ BuildArch: noarch %python_subpackages %description -Pyramid is a small, fast, down-to-earth, open source Python web application -development framework. It makes real-world web application development and -deployment more fun, more predictable, and more productive. - -Pyramid is the newest web framework produced by the Pylons Project -(http://pylonsproject.org). - -Pyramid was previously known as repoze.bfg (http://bfg.repoze.org). +Pyramid is a Python web application development framework +produced by the Pylons Project (http://pylonsproject.org). +It was previously known as repoze.bfg (http://bfg.repoze.org). %package -n %{name}-doc Summary: Documentation for %{name} From 9ff66e1757a8ad6867c2d64b403bc9fc00faaf584a023f9204e268f63251119d Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 7 Sep 2017 16:29:21 +0000 Subject: [PATCH 3/4] Accepting request 522054 from home:TheBlackCat:branches:devel:languages:python - Revert change to older copyright We shouldn't change previous copyrights - Fix doc package dependency issue OBS-URL: https://build.opensuse.org/request/show/522054 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyramid?expand=0&rev=28 --- python-pyramid.changes | 7 +++++++ python-pyramid.spec | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-pyramid.changes b/python-pyramid.changes index 64d8dda..df9b3ee 100644 --- a/python-pyramid.changes +++ b/python-pyramid.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 7 15:57:20 UTC 2017 - toddrme2178@gmail.com + +- Revert change to older copyright + We shouldn't change previous copyrights +- Fix doc package dependency issue + ------------------------------------------------------------------- Mon Aug 7 23:22:39 UTC 2017 - jengelh@inai.de diff --git a/python-pyramid.spec b/python-pyramid.spec index 189ba3a..b5923e6 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -2,7 +2,7 @@ # spec file for package python-pyramid # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2015 LISA GmbH, Bingen, Germany. +# Copyright (c) 2014-2016 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -73,7 +73,6 @@ It was previously known as repoze.bfg (http://bfg.repoze.org). %package -n %{name}-doc Summary: Documentation for %{name} Group: Documentation/HTML -Requires: %{name} = %{version} Provides: %{python_module pyramid-doc = %{version}} %description -n %{name}-doc From 5719e540af61d657eaab88079cfe8a59df94a727629b0f155713c8d9228bedb3 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 11 Sep 2017 15:45:22 +0000 Subject: [PATCH 4/4] Accepting request 522366 from home:TheBlackCat:branches:devel:languages:python - Remove non-free documentation (CC-BY-NC-SA-3.0 license). OBS-URL: https://build.opensuse.org/request/show/522366 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyramid?expand=0&rev=29 --- python-pyramid.changes | 5 +++++ python-pyramid.spec | 34 ++++++++++------------------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/python-pyramid.changes b/python-pyramid.changes index df9b3ee..ead478a 100644 --- a/python-pyramid.changes +++ b/python-pyramid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 8 16:31:46 UTC 2017 - toddrme2178@gmail.com + +- Remove non-free documentation (CC-BY-NC-SA-3.0 license). + ------------------------------------------------------------------- Thu Sep 7 15:57:20 UTC 2017 - toddrme2178@gmail.com diff --git a/python-pyramid.spec b/python-pyramid.spec index b5923e6..0e53941 100644 --- a/python-pyramid.spec +++ b/python-pyramid.spec @@ -18,6 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without test Name: python-pyramid Version: 1.9.1 Release: 0 @@ -34,14 +35,9 @@ BuildRequires: %{python_module translationstring} >= 0.4 BuildRequires: %{python_module venusian} >= 1.0 BuildRequires: %{python_module zope.deprecation} >= 3.5.0 BuildRequires: %{python_module zope.interface} >= 3.8.0 -# SECTION documentation requirements -BuildRequires: python3-Sphinx >= 1.3.5 -BuildRequires: python3-docutils -BuildRequires: python3-pylons-sphinx-themes -BuildRequires: python3-repoze.sphinx.autointerface -BuildRequires: python3-sphinxcontrib-autoprogram -# /SECTION -# SECTION testing requirements +BuildRequires: fdupes +BuildRequires: python-rpm-macros +%if %{with test} BuildRequires: %{python_module WebTest} >= 1.3.1 BuildRequires: %{python_module coverage} BuildRequires: %{python_module hupper} @@ -49,9 +45,7 @@ BuildRequires: %{python_module nose} BuildRequires: %{python_module plaster-pastedeploy} BuildRequires: %{python_module plaster} BuildRequires: %{python_module zope.component} >= 4.0 -# /SECTION -BuildRequires: fdupes -BuildRequires: python-rpm-macros +%endif Requires: python-PasteDeploy >= 1.5.0 Requires: python-WebOb >= 1.7.0 Requires: python-repoze.lru >= 0.4 @@ -70,13 +64,8 @@ Pyramid is a Python web application development framework produced by the Pylons Project (http://pylonsproject.org). It was previously known as repoze.bfg (http://bfg.repoze.org). -%package -n %{name}-doc -Summary: Documentation for %{name} -Group: Documentation/HTML -Provides: %{python_module pyramid-doc = %{version}} - -%description -n %{name}-doc -This package contains documentation files for %{name}. +# NOTE: The documentation in the docs/ directory is under a +# non-free license (CC-BY-NC-SA-3.0). Do not package it. %prep %setup -q -n pyramid-%{version} @@ -87,7 +76,6 @@ touch -r pyramid/__init__.py pyramid/scaffolds/alchemy/+package+/scripts/__init_ %build %python_build %{_python_use_flavor python3} -%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install %python_install @@ -99,9 +87,11 @@ for p in pcreate pdistreport prequest proutes pserve pshell ptweens pviews; do %python_clone -a %{buildroot}%{_bindir}/$p done +%if %{with test} %check export LANG=en_US.UTF-8 -%python_expand $python setup.py nosetests --with-coverage -vvv +%python_exec setup.py nosetests --with-coverage -vvv +%endif %post %python_install_alternative pcreate pdistreport prequest proutes pserve pshell ptweens pviews @@ -122,8 +112,4 @@ export LANG=en_US.UTF-8 %python_alternative %{_bindir}/pviews %{python_sitelib}/* -%files -n %{name}-doc -%defattr(-,root,root,-) -%doc build/sphinx/html - %changelog