From c2247d6823fe1647107c1e13976d42ab744349d96bc87c680ef47697275f576f Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 1 Jun 2019 08:14:02 +0000
Subject: [PATCH] Accepting request 706639 from KDE:Distro:Factory

- Fix file conflicts when installing qalculate-data with old qalculate

- Update to 3.2.0
  * Updated physical constants (CODATA 2018)
  * Programming keypad (GUI) and programming mode (CLI)
  * Bookmarks and protect (from disappearing of the end of the list) option for
    history (GUI)
  * New and updated keypad buttons (GUI)
  * Keypad in number bases dialog (GUI)
  * bitrot() function for bit rotation
  * Bitwise XOR, mod and rem operators, % as modulo, // and \ operators for
    integer division
  * Change order of operations for logical and bitwise operators to better
    match C operator precedence
  * Improved support for functions, variables and units with input base > 10
  * Unicode support in char() and code()
  * Simplification and factorization improvements
  * RPN syntax improvements
  * Recognize "factor" and "expand" commands at the beginning expressions
  * For vector + scalar, add scalar to all components
  * uptime variable
  * Fix random segfault on automatic unit category selection (GUI)
  * Fix display of number in sexagesimal base or time format (GUI)
  * Fix abs(x)=a for complex x
  * Minor bug fixes and feature improvements

OBS-URL: https://build.opensuse.org/request/show/706639
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qalculate?expand=0&rev=26
---
 libqalculate-3.1.0.tar.gz |  3 ---
 libqalculate-3.2.0.tar.gz |  3 +++
 qalculate.changes         | 32 ++++++++++++++++++++++++++++++++
 qalculate.spec            |  4 +++-
 4 files changed, 38 insertions(+), 4 deletions(-)
 delete mode 100644 libqalculate-3.1.0.tar.gz
 create mode 100644 libqalculate-3.2.0.tar.gz

diff --git a/libqalculate-3.1.0.tar.gz b/libqalculate-3.1.0.tar.gz
deleted file mode 100644
index a54c7c4..0000000
--- a/libqalculate-3.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40174309c59a0eebdc42d63b230662d8b897bee21a6a31f10d7387b17b133a11
-size 2045988
diff --git a/libqalculate-3.2.0.tar.gz b/libqalculate-3.2.0.tar.gz
new file mode 100644
index 0000000..e996afc
--- /dev/null
+++ b/libqalculate-3.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15a7456eb084ecacf3959b78cd764371e4f68a4a9cc3655ec4f335ca14cdefd9
+size 2035352
diff --git a/qalculate.changes b/qalculate.changes
index c0e0576..931dde7 100644
--- a/qalculate.changes
+++ b/qalculate.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Fri May 31 09:50:44 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Fix file conflicts when installing qalculate-data with old qalculate
+
+-------------------------------------------------------------------
+Wed May 29 20:17:28 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 3.2.0
+  * Updated physical constants (CODATA 2018)
+  * Programming keypad (GUI) and programming mode (CLI)
+  * Bookmarks and protect (from disappearing of the end of the list) option for
+    history (GUI)
+  * New and updated keypad buttons (GUI)
+  * Keypad in number bases dialog (GUI)
+  * bitrot() function for bit rotation
+  * Bitwise XOR, mod and rem operators, % as modulo, // and \ operators for
+    integer division
+  * Change order of operations for logical and bitwise operators to better
+    match C operator precedence
+  * Improved support for functions, variables and units with input base > 10
+  * Unicode support in char() and code()
+  * Simplification and factorization improvements
+  * RPN syntax improvements
+  * Recognize "factor" and "expand" commands at the beginning expressions
+  * For vector + scalar, add scalar to all components
+  * uptime variable
+  * Fix random segfault on automatic unit category selection (GUI)
+  * Fix display of number in sexagesimal base or time format (GUI)
+  * Fix abs(x)=a for complex x
+  * Minor bug fixes and feature improvements
+
 -------------------------------------------------------------------
 Fri Apr 26 09:49:03 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/qalculate.spec b/qalculate.spec
index f79af63..9b66639 100644
--- a/qalculate.spec
+++ b/qalculate.spec
@@ -19,7 +19,7 @@
 %define major   21
 %define libname libqalculate
 Name:           qalculate
-Version:        3.1.0
+Version:        3.2.0
 Release:        0
 Summary:        Multi-purpose desktop calulator application
 License:        GPL-2.0-or-later
@@ -63,6 +63,8 @@ Summary:        Additional data for the qalculator calulator library
 Group:          Productivity/Scientific/Math
 Requires:       %{libname} = %{version}
 Provides:       %{name}:%{_datadir}/%{name}/units.xml
+# Files were split out into -data with 2.6.2
+Conflicts:      %{name} < 2.6.2
 BuildArch:      noarch
 
 %description data