ralph pushed to python-pyramid (master). "1.4.6 for epel7."

[notifications at fedoraproject.org]

>From cde37f5d1ef0478b7504ca123cc3dd73e6ce136a Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
Date: Fri, 7 Nov 2014 22:42:55 -0500
Subject: 1.4.6 for epel7.


diff --git a/.gitignore b/.gitignore
index e910377..144f73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pyramid-1.0.tar.gz
 /pyramid-1.4b3.tar.gz
 /pyramid-1.4.tar.gz
 /pyramid-1.5.1.tar.gz
+/pyramid-1.4.6.tar.gz
diff --git a/python-pyramid-xml-mimetype.patch b/python-pyramid-xml-mimetype.patch
deleted file mode 100644
index 7be8b03..0000000
--- a/python-pyramid-xml-mimetype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pyramid-1.5.1.orig/pyramid/tests/test_response.py	2014-08-27 21:16:28.972378071 -0600
-+++ pyramid-1.5.1/pyramid/tests/test_response.py	2014-08-27 21:17:01.592432632 -0600
-@@ -53,7 +53,7 @@
-     def test_without_content_type(self):
-         for suffix, content_type in (
-             ('txt', 'text/plain; charset=UTF-8'),
--            ('xml', 'application/xml; charset=UTF-8'),
-+            ('xml', 'text/xml; charset=UTF-8'),
-             ('pdf', 'application/pdf')
-         ):
-             path = self._getPath(suffix)
diff --git a/python-pyramid.spec b/python-pyramid.spec
index faeee34..f225b48 100644
--- a/python-pyramid.spec
+++ b/python-pyramid.spec
@@ -5,7 +5,7 @@
 %global modname pyramid
 
 Name:           python-%{modname}
-Version:        1.5.1
+Version:        1.4.6
 Release:        1%{?dist}
 Summary:        The Pyramid web application framework, a Pylons project
 
@@ -13,8 +13,6 @@ Group:          Development/Libraries
 License:        BSD
 URL:            http://pylonsproject.com
 Source0:        http://pypi.python.org/packages/source/p/pyramid/%{modname}-%{version}.tar.gz
-# https://github.com/Pylons/pyramid/issues/1405
-Patch0:         %{name}-xml-mimetype.patch
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -131,10 +129,9 @@ fun, more predictable, and more productive.
 
 %prep
 %setup -q -n pyramid-%{version}
-%patch0 -p1 -b .mimetype
 
 # 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.3.1\", \"PasteDeploy>=1.5.0\", \"WebTest>=1.3.1\", \"zope.interface>=4.0.2\"]; import pkg_resources"}1' setup.py > setup.py.tmp
+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
@@ -161,6 +158,7 @@ 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
@@ -168,7 +166,6 @@ 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
 
@@ -194,6 +191,10 @@ 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
@@ -201,13 +202,16 @@ 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
@@ -215,12 +219,11 @@ popd
 %{_bindir}/python3-pshell
 %{_bindir}/python3-ptweens
 %{_bindir}/python3-pviews
-%{_bindir}/python3-pdistreport
 %endif
 
 %changelog
-* Wed Aug 27 2014 Luke Macken <lmacken at redhat.com> - 1.5.1-1
-- Update to 1.5.1
+* Fri Nov 07 2014 Ralph Bean <rbean at redhat.com> - 1.4.6-1
+- Upstream 1.4.6 for epel7.
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 9a04e29..2c89832 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a1ab3b773d8e22437828f7df22852c1  pyramid-1.5.1.tar.gz
+7efcad65f5774e1362f270460a542944  pyramid-1.4.6.tar.gz
-- 
cgit v0.10.2


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