From 2652dd01647375c54f2cc046a471cabe20712a9464d6d6d58c620deed1181867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 2 Nov 2017 12:06:49 +0000
Subject: [PATCH] Accepting request 538308 from
 home:badshah400:branches:science

- Update to version 2.1.5:
  * Interim release to get a number of bug fixes out to everyone,
    and to use as basis for binary packages for several new
    distributions.
- Drop cadabra2-cmake-error.patch; fixed upstream.
- Fix Group for cadabra2-doc-pdf: Documentation/PDF doesn't exist,
  use Documentation/Other
- Change hashbang "/usr/bin/env python3" to "/usr/bn/python3".

OBS-URL: https://build.opensuse.org/request/show/538308
OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=9
---
 2.1.5.tar.gz               |  3 ---
 2.1.6.tar.gz               |  3 +++
 cadabra2-cmake-error.patch | 13 -------------
 cadabra2.changes           | 12 ++++++++++++
 cadabra2.spec              | 11 +++++------
 5 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 2.1.5.tar.gz
 create mode 100644 2.1.6.tar.gz
 delete mode 100644 cadabra2-cmake-error.patch

diff --git a/2.1.5.tar.gz b/2.1.5.tar.gz
deleted file mode 100644
index 12a50de..0000000
--- a/2.1.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:204bb179484d08f3114deff0279099a231accb39034aa9e4e658ef7923cd8442
-size 4581968
diff --git a/2.1.6.tar.gz b/2.1.6.tar.gz
new file mode 100644
index 0000000..bf58398
--- /dev/null
+++ b/2.1.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:462d902393a7d17637846debcd7205478f46465d418fe3359a450168ad8810e0
+size 4595203
diff --git a/cadabra2-cmake-error.patch b/cadabra2-cmake-error.patch
deleted file mode 100644
index 6683fac..0000000
--- a/cadabra2-cmake-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cadabra2-2.1.4/CMakeLists.txt
-===================================================================
---- cadabra2-2.1.4.orig/CMakeLists.txt
-+++ cadabra2-2.1.4/CMakeLists.txt
-@@ -17,7 +17,7 @@ endif()
- if(GIT_COMMIT_DATE)
-   set(CADABRA_VERSION_DATE "${GIT_COMMIT_DATE}")
- else()
--  execute(COMMAND date -I OUTPUT_VARIABLE THE_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  execute_process(COMMAND date -I OUTPUT_VARIABLE THE_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-   set(CADABRA_VERSION_DATE "${THE_DATE}") 
- endif()
- message("-- Building ${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}")
diff --git a/cadabra2.changes b/cadabra2.changes
index 9fa35e3..1ebdbba 100644
--- a/cadabra2.changes
+++ b/cadabra2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Nov  2 09:19:33 UTC 2017 - badshah400@gmail.com
+
+- Update to version 2.1.5:
+  * Interim release to get a number of bug fixes out to everyone,
+    and to use as basis for binary packages for several new
+    distributions.
+- Drop cadabra2-cmake-error.patch; fixed upstream.
+- Fix Group for cadabra2-doc-pdf: Documentation/PDF doesn't exist,
+  use Documentation/Other
+- Change hashbang "/usr/bin/env python3" to "/usr/bn/python3".
+
 -------------------------------------------------------------------
 Wed Oct 11 12:04:47 UTC 2017 - badshah400@gmail.com
 
diff --git a/cadabra2.spec b/cadabra2.spec
index 0091b02..a590c1d 100644
--- a/cadabra2.spec
+++ b/cadabra2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cadabra2
-Version:        2.1.5
+Version:        2.1.6
 Release:        0
 Summary:        A computer algebra system for solving problems in field theory
 License:        GPL-3.0+
@@ -26,8 +26,6 @@ Url:            http://cadabra.science/
 Source0:        https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 Source2:        %{name}-gtk.appdata.xml
-# PATCH-FIX-UPSTREAM cadabra2-cmake-error.patch badshah400@gmail.com -- Cmake needs to call "execute_process" instead of "execute"; fixes build failures
-Patch0:         cadabra2-cmake-error.patch
 BuildRequires:  appstream-glib
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -153,8 +151,7 @@ This package provides html documentation for %{name}.
 
 %package doc-pdf
 Summary:        A computer algebra system for solving problems in field theory
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group:          Documentation/PDF
+Group:          Documentation/Other
 
 %description doc-pdf
 Cadabra2 is a computer algebra system (CAS) designed specifically for
@@ -164,7 +161,6 @@ This package provides documentation in the form of a PDF file for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 mkdir build && pushd build
@@ -195,6 +191,9 @@ popd
 # INSTALL APPDATA TO /usr/share/metainfo
 install -D -m0644 %{S:2} %{buildroot}%{_datadir}/metainfo/%{name}-gtk.appdata.xml
 
+# Replace "/usr/bin/env python3" hashbang by "/usr/bin/python3"
+sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}/cadabra2
+
 %post
 %{_bindir}/texhash
 /sbin/ldconfig