Accepting request 668595 from home:badshah400:branches:science

- Update to version 2.2.4:
  * Minor bug fixes.
- Rebase cadabra2-add-pthread-to-cxxflags.patch for minor changes
  to source CMakeLists.txt file.
- Use make doc instead of running doxygen directly.
- Drop commented out commands to generate PDF documentation.

OBS-URL: https://build.opensuse.org/request/show/668595
OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=24

2.2.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e0a408ab8fa611091bc4d776dd44efd730c2651e02e62cfd0251bd1d6b96249
-size 23915602

2.2.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e75e5bf1763e55d795eb876bff61e1b5b359488a8b5db0b45eabd0d04df92c9
+size 23960964

cadabra2-add-pthread-to-cxxflags.patch

@@ -1,13 +1,13 @@
-Index: cadabra2-2.2.0/CMakeLists.txt
+Index: cadabra2-2.2.4/CMakeLists.txt
 ===================================================================
---- cadabra2-2.2.0.orig/CMakeLists.txt
+--- cadabra2-2.2.4.orig/CMakeLists.txt
-+++ cadabra2-2.2.0/CMakeLists.txt
++++ cadabra2-2.2.4/CMakeLists.txt
-@@ -80,7 +80,7 @@ debug_message("Initial compiler flags: $
+@@ -102,7 +102,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.")
- # GCC
+ 		endif()
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ 	endif()
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Wno-unused-but-set-variable")
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -fvisibility=hidden -Wno-unused-but-set-variable")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Wno-unused-but-set-variable -pthread")
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -fvisibility=hidden -Wno-unused-but-set-variable -pthread")
  endif()
  
  # Clang

cadabra2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jan 25 08:44:42 UTC 2019 - badshah400@gmail.com
+
+- Update to version 2.2.4:
+  * Minor bug fixes.
+- Rebase cadabra2-add-pthread-to-cxxflags.patch for minor changes
+  to source CMakeLists.txt file.
+- Use make doc instead of running doxygen directly.
+- Drop commented out commands to generate PDF documentation.
+
 -------------------------------------------------------------------
 Mon Apr 30 07:11:16 UTC 2018 - guillaume.gardet@opensuse.org
 

cadabra2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cadabra2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           cadabra2
-Version:        2.2.0
+Version:        2.2.4
 Release:        0
 Summary:        A computer algebra system for solving problems in field theory
 License:        GPL-3.0-or-later
@@ -152,23 +152,13 @@ the solution of problems encountered in field theory.
 
 This package provides html documentation for %{name}.
 
-%package doc-pdf
-Summary:        A computer algebra system for solving problems in field theory
-Group:          Documentation/Other
-
-%description doc-pdf
-Cadabra2 is a computer algebra system (CAS) designed specifically for
-the solution of problems encountered in field theory.
-
-This package provides documentation in the form of a PDF file for %{name}.
-
 %prep
 %setup -q
 %patch1 -p1
 
 %build
-mkdir build && pushd build
 # FIXME: you should use %%cmake macro but it doesn't work
+mkdir build && pushd build
 cmake \\\
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
   -DPACKAGING_MODE=ON \\\
@@ -182,13 +172,7 @@ cmake \\\
 
 make %{?_smp_mflags}
 popd
-
+make %{?_smp_mflags} doc
-doxygen
-
-# FIXME: ENABLE WHEN LATEX DOC BUILDING IS FIXED
-#pushd doxygen/latex
-#make %{?_smp_mflags}
-#popd
 
 %install
 %cmake_install DESTDIR=%{buildroot}
@@ -207,13 +191,9 @@ mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
 ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
 
 %post
-# FIXME: ENABLE WHEN LATEX DOC BUILDING IS FIXED
-#%{_bindir}/texhash
 /sbin/ldconfig
 
 %postun
-# FIXME: ENABLE WHEN LATEX DOC BUILDING IS FIXED
-#%{_bindir}/texhash
 /sbin/ldconfig
 
 %if 0%{?suse_version} <= 1320
@@ -253,9 +233,4 @@ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/la
 %defattr(-,root,root)
 %doc doxygen/html
 
-# FIXME: ENABLE WHEN LATEX DOC BUILDING IS FIXED
-#%files doc-pdf
-#%defattr(-,root,root)
-#%doc doxygen/latex/refman.pdf
-
 %changelog