[calc: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/calc

[Matthew Miller]

commit d844ecdaa84e5195935ad2eb646710fb610ebe77
Merge: 203e7d3 4e389de
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Sep 25 08:26:10 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/calc
    
    Conflicts:
    	calc.spec
    
    Resolved mass rebuild changelog conflict

 calc.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc calc.spec
index bd9ab21,f83e834..8577c6f
--- a/calc.spec
+++ b/calc.spec
@@@ -234,19 -232,13 +234,25 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Mon Sep 22 2014 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.14-1
 +- update to 2.12.4.14
 +- see CHANGES -- fixes at least one significant bug in complex number
 +  comparison, plus  many other bugfixes which should mostly be
 +  operational, not in the math parts.
 +- minor tweak to LGPL->GPL conversion logic in specfile
 +- fix wrong versions in changelog going back a couple of years; oops.
 +  (Affects changelog only, and... retroactively. Sorry.)
 +
 +* Thu Mar 27 2014 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.13-2
 +- use license tag for license instead of docs
 +
+ * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.4.13-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.4.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
 -* Sun Feb 02 2014 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.13-1
 +* Sun Feb 02 2014 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.13-1
  - update to new ultra-minor upstream version. This update includes a
    fix to lucas.cal; if you know what the Lucas primality test is, you
    may want this update, and otherwise you probably do not care.