diff --git a/.gitignore b/.gitignore index de4ffdf..5be8eee 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libqalculate-0.9.7.tar.gz /libqalculate-2.4.0.tar.gz /libqalculate-2.5.0.tar.gz /libqalculate-2.6.0b.tar.gz +/libqalculate-2.6.1.tar.gz diff --git a/libqalculate-2.5.0_fix_segfault.patch b/libqalculate-2.5.0_fix_segfault.patch deleted file mode 100644 index 7a1f545..0000000 --- a/libqalculate-2.5.0_fix_segfault.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libqalculate/Calculator.cc.orig 2018-05-15 00:14:33.000000000 -0400 -+++ libqalculate/Calculator.cc 2018-05-18 18:05:14.646690898 -0400 -@@ -5537,7 +5537,7 @@ - return true; - } - if((i = str.find_first_of(LESS GREATER EQUALS NOT, 0)) != string::npos) { -- while((i != string::npos && (str[i] == LESS_CH && i + 1 < str.length() && str[i + 1] == LESS_CH)) || (str[i] == GREATER_CH && i + 1 < str.length() && str[i + 1] == GREATER_CH)) { -+ while(i != string::npos && ((str[i] == LESS_CH && i + 1 < str.length() && str[i + 1] == LESS_CH) || (str[i] == GREATER_CH && i + 1 < str.length() && str[i + 1] == GREATER_CH))) { - i = str.find_first_of(LESS GREATER NOT EQUALS, i + 2); - } - } -@@ -5552,7 +5552,7 @@ - } - MathOperation s = OPERATION_ADD; - while(!c) { -- while((i != string::npos && (str[i] == LESS_CH && i + 1 < str.length() && str[i + 1] == LESS_CH)) || (str[i] == GREATER_CH && i + 1 < str.length() && str[i + 1] == GREATER_CH)) { -+ while(i != string::npos && ((str[i] == LESS_CH && i + 1 < str.length() && str[i + 1] == LESS_CH) || (str[i] == GREATER_CH && i + 1 < str.length() && str[i + 1] == GREATER_CH))) { - i = str.find_first_of(LESS GREATER NOT EQUALS, i + 2); - while(i != string::npos && str[i] == NOT_CH && str.length() > i + 1 && str[i + 1] == NOT_CH) { - i++; diff --git a/libqalculate.spec b/libqalculate.spec index dd1f72a..6531026 100644 --- a/libqalculate.spec +++ b/libqalculate.spec @@ -2,8 +2,8 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} License: GPLv2+ URL: https://qalculate.github.io/ @@ -82,6 +82,9 @@ rm -f %{buildroot}/%{_libdir}/*.la %{_bindir}/qalc %changelog +* Wed Jul 11 2018 Mukundan Ragavan - 2.6.1-1 +- Update to 2.6.1 + * Tue Jul 10 2018 Pete Walter - 2.6.0-2 - Rebuild for ICU 62 diff --git a/sources b/sources index 1239af8..8bf0f4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libqalculate-2.6.0b.tar.gz) = 975de42d16912dbdf7e0d6e7b6e051ba21b5bf0ae053f7578c6b1ea8d7aa5103a35c422a84da8a77292e55d757fdb64e6127091540b2b1a1c77fcb2fee562a57 +SHA512 (libqalculate-2.6.1.tar.gz) = d6e943c016a9c4d9a437f5ff52472cb7cb0b3a0799e3a6d599a82366fdfa537d0fe1fab8add56e0ee18b39a08926009bff650f5b6446126db2765c633da2963e