ralph pushed to python-pyramid (master). "1.5.6"

[notifications at fedoraproject.org]

>From faef1639518ca1fef28c084b82afb6ce4918be7f Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
Date: Wed, 15 Apr 2015 20:20:25 -0400
Subject: 1.5.6


diff --git a/.gitignore b/.gitignore
index 144f73b..50284df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pyramid-1.0.tar.gz
 /pyramid-1.4.tar.gz
 /pyramid-1.5.1.tar.gz
 /pyramid-1.4.6.tar.gz
+/pyramid-1.5.6.tar.gz
diff --git a/python-pyramid.spec b/python-pyramid.spec
index 1ad49c9..c30f916 100644
--- a/python-pyramid.spec
+++ b/python-pyramid.spec
@@ -5,8 +5,8 @@
 %global modname pyramid
 
 Name:           python-%{modname}
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.5.6
+Release:        1%{?dist}
 Summary:        The Pyramid web application framework, a Pylons project
 
 Group:          Development/Libraries
@@ -42,24 +42,10 @@ Requires:       python-zope-deprecation >= 3.5.0
 BuildRequires:  python-webob >= 1.2
 Requires:       python-webob >= 1.2
 %else
-BuildRequires:  python-webob1.2
-Requires:       python-webob1.2
+BuildRequires:  python-webob1.4
+Requires:       python-webob1.4
 %endif
 
-# Handle forwards-compat packages for rhel/el6
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires:  python-webtest1.3
-BuildRequires:  python-mako0.4
-Requires:       python-mako0.4
-BuildRequires:  python-zope-interface4
-Requires:       python-zope-interface4
-BuildRequires:  python-paste-deploy1.5
-Requires:       python-paste-deploy1.5
-BuildRequires:  python-unittest2
-Requires:       python-unittest2
-BuildRequires:  python-ordereddict
-Requires:       python-ordereddict
-%else
 BuildRequires:  python-webtest
 BuildRequires:  python-mako >= 0.3.6
 Requires:       python-mako >= 0.3.6
@@ -67,7 +53,6 @@ BuildRequires:  python-zope-interface >= 3.8.0
 Requires:       python-zope-interface >= 3.8.0
 BuildRequires:  python-paste-deploy >= 1.5.0
 Requires:       python-paste-deploy >= 1.5.0
-%endif
 
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
@@ -130,10 +115,6 @@ fun, more predictable, and more productive.
 %prep
 %setup -q -n pyramid-%{version}
 
-# Force that a certain version of webob is imported and not the older one.
-awk 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"WebOb>=1.2.1\", \"PasteDeploy>=1.5.0\", \"WebTest==1.3.4\", \"zope.interface>=4.0.2\"]; import pkg_resources"}1' setup.py > setup.py.tmp
-mv setup.py.tmp setup.py
-
 # Remove bundled egg info
 rm -rf %{modname}.egg-info
 
@@ -158,7 +139,6 @@ pushd %{py3dir}
 cp -r pyramid/scaffolds/alchemy %{buildroot}/%{python3_sitelib}/pyramid/scaffolds/.
 cp -r pyramid/scaffolds/starter %{buildroot}/%{python3_sitelib}/pyramid/scaffolds/.
 cp -r pyramid/scaffolds/zodb %{buildroot}/%{python3_sitelib}/pyramid/scaffolds/.
-mv %{buildroot}/%{_bindir}/bfg2pyramid %{buildroot}/%{_bindir}/python3-bfg2pyramid
 mv %{buildroot}/%{_bindir}/pcreate %{buildroot}/%{_bindir}/python3-pcreate
 mv %{buildroot}/%{_bindir}/pserve %{buildroot}/%{_bindir}/python3-pserve
 mv %{buildroot}/%{_bindir}/prequest %{buildroot}/%{_bindir}/python3-prequest
@@ -166,6 +146,7 @@ mv %{buildroot}/%{_bindir}/proutes %{buildroot}/%{_bindir}/python3-proutes
 mv %{buildroot}/%{_bindir}/pshell %{buildroot}/%{_bindir}/python3-pshell
 mv %{buildroot}/%{_bindir}/ptweens %{buildroot}/%{_bindir}/python3-ptweens
 mv %{buildroot}/%{_bindir}/pviews %{buildroot}/%{_bindir}/python3-pviews
+mv %{buildroot}/%{_bindir}/pdistreport %{buildroot}/%{_bindir}/python3-pdistreport
 popd
 %endif
 
@@ -191,10 +172,6 @@ popd
 %doc README.rst LICENSE.txt
 %{python_sitelib}/%{modname}/
 %{python_sitelib}/%{modname}-%{version}*.egg-info
-%{python_sitelib}/%{modname}/scaffolds/alchemy/
-%{python_sitelib}/%{modname}/scaffolds/starter/
-%{python_sitelib}/%{modname}/scaffolds/zodb/
-%{_bindir}/bfg2pyramid
 %{_bindir}/pcreate
 %{_bindir}/pserve
 %{_bindir}/prequest
@@ -202,16 +179,13 @@ popd
 %{_bindir}/pshell
 %{_bindir}/ptweens
 %{_bindir}/pviews
+%{_bindir}/pdistreport
 
 %if 0%{?with_python3}
 %files -n python3-pyramid
 %doc README.rst LICENSE.txt
 %{python3_sitelib}/%{modname}/
 %{python3_sitelib}/%{modname}-%{version}*.egg-info
-%{python3_sitelib}/%{modname}/scaffolds/alchemy/
-%{python3_sitelib}/%{modname}/scaffolds/starter/
-%{python3_sitelib}/%{modname}/scaffolds/zodb/
-%{_bindir}/python3-bfg2pyramid
 %{_bindir}/python3-pcreate
 %{_bindir}/python3-pserve
 %{_bindir}/python3-prequest
@@ -219,9 +193,13 @@ popd
 %{_bindir}/python3-pshell
 %{_bindir}/python3-ptweens
 %{_bindir}/python3-pviews
+%{_bindir}/python3-pdistreport
 %endif
 
 %changelog
+* Wed Apr 15 2015 Ralph Bean <rbean at redhat.com> - 1.5.6-1
+- new version
+
 * Wed Apr 15 2015 Ralph Bean <rbean at redhat.com> - 1.5.1-2
 - Upstream epel7 to 1.5.1.
 
diff --git a/sources b/sources
index 2c89832..b84df50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7efcad65f5774e1362f270460a542944  pyramid-1.4.6.tar.gz
+29339e810739a0e160a93f80a5ab0eff  pyramid-1.5.6.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-pyramid.git/commit/?h=master&id=faef1639518ca1fef28c084b82afb6ce4918be7f