From 8f4213d8e25f53343ecba786488b73490b5f264cc38d3784ce14730a03a9fb5d Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Tue, 19 Mar 2019 13:51:22 +0000
Subject: [PATCH] Accepting request 685427 from
 home:badshah400:branches:science

- Update to version 2.2.5:
  * Interim bug fix release with fixes for upcoming Debian as well
    as the new explicit_indices algorithm.
- Move man files to the correct _mandir.
- Minor cleanups using spec-cleaner.

OBS-URL: https://build.opensuse.org/request/show/685427
OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=26
---
 2.2.4.tar.gz                           |  3 ---
 2.2.5.tar.gz                           |  3 +++
 cadabra2-add-pthread-to-cxxflags.patch |  8 ++++----
 cadabra2.changes                       |  9 +++++++++
 cadabra2.spec                          | 25 +++++++++++++------------
 5 files changed, 29 insertions(+), 19 deletions(-)
 delete mode 100644 2.2.4.tar.gz
 create mode 100644 2.2.5.tar.gz

diff --git a/2.2.4.tar.gz b/2.2.4.tar.gz
deleted file mode 100644
index 6e9522a..0000000
--- a/2.2.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e75e5bf1763e55d795eb876bff61e1b5b359488a8b5db0b45eabd0d04df92c9
-size 23960964
diff --git a/2.2.5.tar.gz b/2.2.5.tar.gz
new file mode 100644
index 0000000..68adbdf
--- /dev/null
+++ b/2.2.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e96d413b71736a304f2b6b035e118d72017b5c6ecc019914e47f174055095c1
+size 24064420
diff --git a/cadabra2-add-pthread-to-cxxflags.patch b/cadabra2-add-pthread-to-cxxflags.patch
index 94e3d62..839154d 100644
--- a/cadabra2-add-pthread-to-cxxflags.patch
+++ b/cadabra2-add-pthread-to-cxxflags.patch
@@ -1,8 +1,8 @@
-Index: cadabra2-2.2.4/CMakeLists.txt
+Index: cadabra2-2.2.5/CMakeLists.txt
 ===================================================================
---- cadabra2-2.2.4.orig/CMakeLists.txt
-+++ cadabra2-2.2.4/CMakeLists.txt
-@@ -102,7 +102,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
+--- cadabra2-2.2.5.orig/CMakeLists.txt
++++ cadabra2-2.2.5/CMakeLists.txt
+@@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
  			message(FATAL_ERROR "GCC version must be at least 4.9 for regex support! See http://askubuntu.com/questions/428198/getting-installing-gcc-g-4-9-on-ubuntu and then set the environment variables CXX to g++-4.9 and CC to gcc-4.9. You may have to erase the build directory before re-running cmake.")
  		endif()
  	endif()
diff --git a/cadabra2.changes b/cadabra2.changes
index 1a8558a..2c1170a 100644
--- a/cadabra2.changes
+++ b/cadabra2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 15 14:17:41 UTC 2019 - Atri B <badshah400@gmail.com>
+
+- Update to version 2.2.5:
+  * Interim bug fix release with fixes for upcoming Debian as well
+    as the new explicit_indices algorithm.
+- Move man files to the correct _mandir.
+- Minor cleanups using spec-cleaner.
+
 -------------------------------------------------------------------
 Fri Jan 25 08:44:42 UTC 2019 - badshah400@gmail.com
 
diff --git a/cadabra2.spec b/cadabra2.spec
index e864403..16fb279 100644
--- a/cadabra2.spec
+++ b/cadabra2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cadabra2
-Version:        2.2.4
+Version:        2.2.5
 Release:        0
 Summary:        A computer algebra system for solving problems in field theory
 License:        GPL-3.0-or-later
@@ -155,12 +155,15 @@ This package provides html documentation for %{name}.
 %prep
 %setup -q
 %patch1 -p1
+rm examples/.gitignore
 
 %build
+
 # FIXME: you should use %%cmake macro but it doesn't work
 mkdir build && pushd build
 cmake \\\
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
+  -DCMAKE_MANDIR=%{_mandir} \\\
   -DPACKAGING_MODE=ON \\\
 %if 0%{?suse_version} <= 1320
   -DUSE_PYTHON_3=OFF \\\
@@ -185,16 +188,16 @@ install -D -m0644 %{S:2} %{buildroot}%{_datadir}/metainfo/%{name}-gtk.appdata.xm
 # Replace "/usr/bin/env python3" hashbang by "/usr/bin/python3"
 sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}/cadabra2
 
-rm %{buildroot}%{_libexecdir}/*.a
-
 mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
 ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
 
-%post
-/sbin/ldconfig
+# Move man files to proper %%_mandir
+mkdir -p %{buildroot}%{_mandir}/man1
+mv %{buildroot}%{_prefix}/man/man1/* %{buildroot}%{_mandir}/man1/
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %if 0%{?suse_version} <= 1320
 %post gui
@@ -207,8 +210,8 @@ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/la
 %endif
 
 %files
-%defattr(-,root,root)
-%doc README.rst doc/license.txt
+%doc README.rst
+%license doc/license.txt
 %{_bindir}/cadabra2cadabra
 %{_bindir}/cadabra-server
 %{_bindir}/%{name}
@@ -216,9 +219,9 @@ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/la
 %{_bindir}/%{name}html
 %{_datadir}/%{name}/
 %{_datadir}/texmf/tex/latex/cadabra2/
+%{_mandir}/man1/cadabra*.1%{?ext_man}
 
 %files gui
-%defattr(-,root,root)
 %{_bindir}/%{name}-gtk
 %{_datadir}/icons/hicolor/*/apps/cadabra2-gtk.*
 %{_datadir}/applications/cadabra2-gtk.desktop
@@ -226,11 +229,9 @@ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/la
 %{_datadir}/metainfo/*.appdata.xml
 
 %files examples
-%defattr(-,root,root)
 %doc examples/
 
 %files doc
-%defattr(-,root,root)
 %doc doxygen/html
 
 %changelog