[Cython: 2/2] merge

[Neal Becker]

commit 4fd9452351113577dbeb12f5ab29774f6c0bf310
Merge: 690451f 7fb7a35
Author: Neal D. Becker <ndbecker2 at gmail.com>
Date:   Mon Sep 15 11:46:54 2014 -0400

    merge

 .gitignore  |    1 +
 Cython.spec |   20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 9941b6d,5b231ec..dc86f97
--- a/.gitignore
+++ b/.gitignore
@@@ -14,4 -14,4 +14,5 @@@ Cython-0.12.1.tar.g
  /Cython-0.19.tar.gz
  /Cython-0.19.2.tar.gz
  /Cython-0.20.tar.gz
+ /Cython-0.20.1.tar.gz
 +/Cython-0.21.tar.gz
diff --cc Cython.spec
index 1c9973f,53743eb..95b1208
--- a/Cython.spec
+++ b/Cython.spec
@@@ -11,9 -11,9 +11,9 @@@
  ##%define run_check 0%{!?_with_check:0}
  
  Name:		Cython
 -Version:	0.20.1
 +Version:	0.21
  ##Release:	4.b3%{?dist}
- Release:	1%{?dist}
+ Release:	5%{?dist}
  Summary:	A language for writing Python extension modules
  
  %define upstreamversion %{version}
@@@ -140,9 -139,21 +139,24 @@@ pop
  
  
  %changelog
 +* Mon Sep 15 2014 nbecker <ndbecker2 at gmail.com> - 0.21-1
 +- Update to 0.21
 +
+ * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Wed May 28 2014 Thomas Spura <tomspur at fedoraproject.org> - 0.20.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+ 
+ * Fri May  9 2014 Orion Poplawski <orion at cora.nwra.com> - 0.20.1-2
+ - Rebuild for Python 3.4
+ 
+ * Fri May  9 2014 Orion Poplawski <orion at cora.nwra.com> - 0.20.1-1
+ - Update to 0.20.1
+ 
  * Mon Jan 20 2014 nbecker <ndbecker2 at gmail.com> - 0.20-1
  - Update to 0.20