[libsbml/f21: 23/26] Some small build fixes

[Zbigniew Jędrzejewski-Szmek]

commit 607c476c517a50af700699588a737ed9fabcff90
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Feb 13 11:32:18 2015 -0500

    Some small build fixes
    
    - verbose output in tests
    - %autosetup
    - -j does not works for tests anyway, remove it

 libsbml-arm-fix.patch                        |  8 ++++----
 libsbml-fix_install_libpaths.patch           | 16 ++++++++--------
 libsbml.spec                                 | 13 ++++---------
 libsbml_csharp-unexpected_symbol_error.patch |  4 ++--
 4 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/libsbml-arm-fix.patch b/libsbml-arm-fix.patch
index f489389..c6a0e99 100644
--- a/libsbml-arm-fix.patch
+++ b/libsbml-arm-fix.patch
@@ -1,7 +1,7 @@
 Index: src/sbml/math-legacy/FormulaParser.c
 ===================================================================
---- src/sbml/math-legacy/FormulaParser.c	(revision 21966)
-+++ src/sbml/math-legacy/FormulaParser.c	(working copy)
+--- a/src/sbml/math-legacy/FormulaParser.c	(revision 21966)
++++ b/src/sbml/math-legacy/FormulaParser.c	(working copy)
 @@ -115,7 +115,7 @@
  typedef struct
  {
@@ -22,8 +22,8 @@ Index: src/sbml/math-legacy/FormulaParser.c
    }
 Index: src/sbml/math/FormulaParser.c
 ===================================================================
---- src/sbml/math/FormulaParser.c	(revision 21966)
-+++ src/sbml/math/FormulaParser.c	(working copy)
+--- a/src/sbml/math/FormulaParser.c	(revision 21966)
++++ b/src/sbml/math/FormulaParser.c	(working copy)
 @@ -116,7 +116,7 @@
  typedef struct
  {
diff --git a/libsbml-fix_install_libpaths.patch b/libsbml-fix_install_libpaths.patch
index 3715b8a..3f3ff36 100644
--- a/libsbml-fix_install_libpaths.patch
+++ b/libsbml-fix_install_libpaths.patch
@@ -1,7 +1,7 @@
 ##This patch sets libraries' installation paths according to the Fedora packaging guidelines
 
---- src/bindings/ruby/CMakeLists.orig.txt	2014-11-26 13:31:14.000000000 +0100
-+++ src/bindings/ruby/CMakeLists.txt	2014-12-28 23:25:47.035666311 +0100
+--- a/src/bindings/ruby/CMakeLists.orig.txt	2014-11-26 13:31:14.000000000 +0100
++++ b/src/bindings/ruby/CMakeLists.txt	2014-12-28 23:25:47.035666311 +0100
 @@ -170,7 +170,7 @@
  if (UNIX OR CYGWIN) 
    execute_process(COMMAND "${RUBY_EXECUTABLE}" -e "print RUBY_PLATFORM"
@@ -11,8 +11,8 @@
  else()
    set(RUBY_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/ruby)
  endif()
---- src/bindings/csharp/CMakeLists.orig.txt	2014-11-26 13:31:17.000000000 +0100
-+++ src/bindings/csharp/CMakeLists.txt	2014-12-29 11:37:43.839593422 +0100
+--- a/src/bindings/csharp/CMakeLists.orig.txt	2014-11-26 13:31:17.000000000 +0100
++++ b/src/bindings/csharp/CMakeLists.txt	2014-12-29 11:37:43.839593422 +0100
 @@ -199,7 +199,7 @@
  #
  set(CSHAPR_PACKAGE_INSTALL_DIR)
@@ -22,8 +22,8 @@
  else()
    set(CSHAPR_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/csharp)
  endif()
---- src/bindings/octave/CMakeLists.orig.txt	2014-11-26 13:31:10.000000000 +0100
-+++ src/bindings/octave/CMakeLists.txt	2014-12-29 11:44:51.031069073 +0100
+--- a/src/bindings/octave/CMakeLists.orig.txt	2014-11-26 13:31:10.000000000 +0100
++++ b/src/bindings/octave/CMakeLists.txt	2014-12-29 11:44:51.031069073 +0100
 @@ -67,7 +67,7 @@
  if (UNIX OR CYGWIN) 
  execute_process(COMMAND "${OCTAVE_CONFIG_EXECUTABLE}" -p CANONICAL_HOST_TYPE
@@ -33,8 +33,8 @@
  else()
    set(OCTAVE_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/octave)
  endif()
---- src/bindings/perl/CMakeLists.orig.txt	2014-11-26 13:31:13.000000000 +0100
-+++ src/bindings/perl/CMakeLists.txt	2014-12-29 11:48:53.705649453 +0100
+--- a/src/bindings/perl/CMakeLists.orig.txt	2014-11-26 13:31:13.000000000 +0100
++++ b/src/bindings/perl/CMakeLists.txt	2014-12-29 11:48:53.705649453 +0100
 @@ -176,7 +176,7 @@
    string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM})
    string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM})
diff --git a/libsbml.spec b/libsbml.spec
index 5db96f2..18f62d1 100644
--- a/libsbml.spec
+++ b/libsbml.spec
@@ -186,12 +186,7 @@ This package contains %{summary}.
 %endif
 
 %prep
-%setup -q -n libSBML-%{version}-Source
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
+%autosetup -n libSBML-%{version}-Source -p1
 
 sed -i -r 's/DOXYGEN_MAX_VERSION=1\.8\.8/DOXYGEN_MAX_VERSION=1.8.9/' configure
 
@@ -325,9 +320,9 @@ install -Dm0644 src/bindings/ruby/README.txt %{buildroot}%{_pkgdocdir}/README-ru
 %if %{with check}
 %check
 %if %{with python}
-make -C build2 %{?_smp_mflags} check
+make -C build2 check CTEST_OUTPUT_ON_FAILURE=TRUE
 %endif
-make -C build %{?_smp_mflags} check
+make -C build check CTEST_OUTPUT_ON_FAILURE=TRUE
 %endif
 
 %post -p /sbin/ldconfig
@@ -415,7 +410,7 @@ make -C build %{?_smp_mflags} check
 
 %changelog
 * Fri Feb 06 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 5.11.0-10
-- Rename -doc to -docs, run make unparallized
+- Rename -docs to -doc, run make unparallelized
 
 * Wed Feb 04 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 5.11.0-9
 - Apply upstream patch for arm test failures
diff --git a/libsbml_csharp-unexpected_symbol_error.patch b/libsbml_csharp-unexpected_symbol_error.patch
index 5c06b8b..14132cf 100644
--- a/libsbml_csharp-unexpected_symbol_error.patch
+++ b/libsbml_csharp-unexpected_symbol_error.patch
@@ -1,5 +1,5 @@
---- src/bindings/csharp/Makefile.orig.in	2014-11-26 13:31:17.000000000 +0100
-+++ src/bindings/csharp/Makefile.in	2014-12-27 19:41:02.511977754 +0100
+--- a/src/bindings/csharp/Makefile.orig.in	2014-11-26 13:31:17.000000000 +0100
++++ b/src/bindings/csharp/Makefile.in	2014-12-27 19:41:02.511977754 +0100
 @@ -482,6 +482,7 @@
  # files too -- both are made by running swig.
 -