[cantor: 5/5] Merge branch 'f20'

[Rex Dieter]

commit aea82b7a53cc4a937087f23bfa5782bc49012eb8
Merge: 146388d a8d2a55
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri May 9 10:16:09 2014 -0500

    Merge branch 'f20'
    
    Conflicts:
    	.gitignore
    	cantor.spec
    	sources
    
    4.13.0-3
    
    - Missing cantor python interface (#1095918)
    - Provides: cantor-part

 .gitignore  |   27 ------------------------
 cantor.spec |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 33 deletions(-)
---
diff --cc .gitignore
index e3f1e5a,863d021..6a61eb0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,28 -1,26 +1,1 @@@
--/cantor-4.8.5.tar.xz
--/cantor-4.9.1.tar.xz
--/cantor-4.9.2.tar.xz
--/cantor-4.9.3.tar.xz
--/cantor-4.9.4.tar.xz
--/cantor-4.9.5.tar.xz
--/cantor-4.10.1.tar.xz
--/cantor-4.10.2.tar.xz
--/cantor-4.10.3.tar.xz
--/cantor-4.10.4.tar.xz
--/cantor-4.10.90.tar.xz
--/cantor-4.10.95.tar.xz
--/cantor-4.10.97.tar.xz
--/cantor-4.11.0.tar.xz
--/cantor-4.11.1.tar.xz
--/cantor-4.11.2.tar.xz
--/cantor-4.11.3.tar.xz
--/cantor-4.11.90.tar.xz
--/cantor-4.11.95.tar.xz
--/cantor-4.11.97.tar.xz
--/cantor-4.12.0.tar.xz
--/cantor-4.12.1.tar.xz
--/cantor-4.12.2.tar.xz
--/cantor-4.12.3.tar.xz
- /cantor-4.12.90.tar.xz
- /cantor-4.12.95.tar.xz
- /cantor-4.12.97.tar.xz
 -/cantor-4.12.4.tar.xz
 -/cantor-4.12.5.tar.xz
 +/cantor-4.13.0.tar.xz
diff --cc cantor.spec
index 112a0da,bf5f710..4b92880
--- a/cantor.spec
+++ b/cantor.spec
@@@ -1,7 -1,7 +1,7 @@@
 -Name:    cantor 
 +Name:    cantor
  Summary: KDE Frontend to Mathematical Software 
 -Version: 4.12.5
 +Version: 4.13.0
- Release: 2%{?dist}
+ Release: 3%{?dist}
  
  License: GPLv2+
  URL:     https://projects.kde.org/projects/kde/kdeedu/cantor
@@@ -136,20 -186,19 +186,24 @@@ f
  
  
  %changelog
 -* Fri May 09 2014 Rex Dieter <rdieter at fedoraproject.org> 
 -- 4.12.5-3
++* Fri May 09 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.13.0-3
+ - Missing cantor python interface (#1095918)
+ - Provides: cantor-part
+ 
 -* Thu May  8 2014 Tom Callaway <spot at fedoraproject.org> - 4.12.5-2
 -- rebuild against R with no libRblas/libRlapack
 +* Thu May  8 2014 Tom Callaway <spot at fedoraproject.org> - 4.13.0-2
 +- rebuild against R without libRblas/libRlapack
  
 -* Sun Apr 27 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.5-1
 -- 4.12.5
 +* Sat Apr 12 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.13.0-1
 +- 4.13.0
  
 -* Wed Apr 02 2014 Than Ngo <than at redhat.com> - 4.12.4-1
 -- 4.12.4
 +* Fri Apr 04 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.97-1
 +- 4.12.97
 +
 +* Sat Mar 22 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.95-1
 +- 4.12.95
 +
 +* Wed Mar 19 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.90-1
 +- 4.12.90
  
  * Sun Mar 02 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.3-1
  - 4.12.3