[calc/f21] update to 2.12.4.14 -- includes bugfix for complex number comparison

Matthew Miller mattdm at fedoraproject.org
Thu Sep 25 12:56:33 UTC 2014


commit 9174928ba0ede440c66d6d3544335e4d72b466c1
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Sep 25 08:55:34 2014 -0400

    update to 2.12.4.14 -- includes bugfix for complex number comparison

 .gitignore |    1 +
 calc.spec  |   51 ++++++++++++++++++++++++++++++++++-----------------
 sources    |    2 +-
 3 files changed, 36 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 870c91a..737d343 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /calc-2.12.4.10.tar.bz2
 /calc-2.12.4.12.tar.bz2
 /calc-2.12.4.13.tar.bz2
+/calc-2.12.4.14.tar.bz2
diff --git a/calc.spec b/calc.spec
index f83e834..95b9625 100644
--- a/calc.spec
+++ b/calc.spec
@@ -15,8 +15,8 @@ License:       LGPLv2
 %endif
 
 Name:          calc
-Version:       2.12.4.13
-Release:       3%{?dist}
+Version:       2.12.4.14
+Release:       1%{?dist}
 Summary:       Arbitrary precision arithmetic system and calculator
 
 Group:         Applications/Engineering
@@ -85,7 +85,7 @@ useful in themselves.
 
 %if %{with_readline}
   for f in help.c version.c calc.man $( ls help/*|grep  '^help/credit$' ) ; do
-    sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING.LGPL/COPYING-GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
+    sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING\(.\)LGPL/COPYING\1GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
   done
   cp -p %{SOURCE1} COPYING
   cp -p %{SOURCE2} COPYING-GPL
@@ -179,9 +179,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-, root, root, -)
 %if %{with_readline}
-%doc BUGS CHANGES COPYING COPYING-GPL
+%doc BUGS CHANGES
+%license COPYING COPYING-GPL
 %else
-%doc BUGS CHANGES COPYING-LGPL
+%doc BUGS CHANGES
+%license COPYING-LGPL
 %endif
 %{_bindir}/calc
 %{_mandir}/man1/calc.1*
@@ -199,9 +201,11 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-, root, root, -)
 %if %{with_readline}
-%doc BUGS CHANGES COPYING COPYING-GPL
+%doc BUGS CHANGES
+%license COPYING COPYING-GPL
 %else
-%doc BUGS CHANGES COPYING-LGPL
+%doc BUGS CHANGES
+%license COPYING-LGPL
 %endif
 %{_libdir}/libcalc.so.*
 %if %{with_custom_interface}
@@ -232,38 +236,51 @@ 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
+- license tag for both subpackages
+- fix wrong versions in changelog going back a couple of years; oops.
+  (Affects changelog only, and... retroactively. Sorry.)
+
 * 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
+* Thu Mar 27 2014 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.13-2
+- use license tag for license instead of docs
+
+* 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.
 
-* Mon Sep 02 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.12-1
+* Mon Sep 02 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.12-1
 - yet more sample scripts + minor other changes, including ctype-like builtins
 - .cal scripts are not linked, so leave those LGPL
 - bz #959898. Also, happy Labor Day.
 
-* Sun Aug 11 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.10-1
+* Sun Aug 11 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.10-1
 - upstream includes more sample scripts + minor other changes
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.4.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Mon May 20 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.8-1
+* Mon May 20 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.8-1
 - update to newer development version (build system changes only)
 
-* Tue May  7 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.7-2
+* Tue May  7 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.7-2
 - libcalc.so needs to be executable. 
 
-* Tue May  7 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.14.4.7-1
+* Tue May  7 2013 Matthew Miller <mattdm at fedoraproject.org> - 2.12.4.7-1
 - update to newer development version (minor upstream changes)
 
-* Thu Feb 14 2013 Matthew Miller <mattdm at mattdm.org> - 2.14.4.4-6
+* Thu Feb 14 2013 Matthew Miller <mattdm at mattdm.org> - 2.12.4.4-6
 - make the license doc conditional more straightforward; old too-clever
   approach was confusing newer rpm
 - correct which license file is used when readline isn't selected, in case
@@ -279,11 +296,11 @@ rm -rf %{buildroot}
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.4.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Thu Aug 11 2011 Matthew Miller <mattdm at mattdm.org> - 2.14.4.4-2
+* Thu Aug 11 2011 Matthew Miller <mattdm at mattdm.org> - 2.12.4.4-2
 - update GPL to new address
 
-* Wed Aug 10 2011 Matthew Miller <mattdm at mattdm.org> - 2.14.4.4-1
-- update to 2.14.4.4 (latest unstable, but differences from stable
+* Wed Aug 10 2011 Matthew Miller <mattdm at mattdm.org> - 2.12.4.4-1
+- update to 2.12.4.4 (latest unstable, but differences from stable
   are small bugfixes)
 - vsnprintf bug fix is accepted upstream, so remove patch
 
diff --git a/sources b/sources
index b3ff6d2..dec9a99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7955e52ebd6b4f8482ef2b31c490eb35  calc-2.12.4.13.tar.bz2
+da12d25dc4748855d9b901ec78159bdc  calc-2.12.4.14.tar.bz2


More information about the scm-commits mailing list