From d4779a70d98c998c13922f21f0d9e82dda6bc40e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Nov 24 2016 19:13:44 +0000
Subject: Skip gsl-test on epel6 (upstream issue #103)


---

diff --git a/mp.spec b/mp.spec
index 7bab391..c0ef291 100644
--- a/mp.spec
+++ b/mp.spec
@@ -10,10 +10,6 @@
 %global with_gecode	1
 %endif
 
-%if 0%{?rhel}
-%global cmake_ver 3
-%endif
-
 %if 0%{?rhel} && 0%{?rhel} < 7
 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
 %endif
@@ -23,7 +19,7 @@
 
 Name: mp
 Version: 3.1.0
-Release: 4.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
+Release: 5.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
 License: MIT and BSD
 Summary: An open-source library for mathematical programming
 URL: https://github.com/ampl/mp
@@ -36,7 +32,7 @@ Patch2:	 %{name}-%{version}-jni.patch
 Requires: environment(modules)
 BuildRequires: atlas-devel
 %if 0%{?rhel}
-BuildRequires: cmake%{cmake_ver}
+BuildRequires: cmake3
 %else
 BuildRequires: cmake
 %endif
@@ -124,15 +120,28 @@ BUILD="$BUILD,gsl,smpswriter"
 export CFLAGS="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DNDEBUG"
 export CXXFLAGS="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DNDEBUG"
 export LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now"
-cmake%{cmake_ver} -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/%{name}	\
+%cmake3 -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/%{name} \
  -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-z,now -fPIC -pie -Wl,--as-needed" \
  -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DNDEBUG" \
  -DCMAKE_C_FLAGS_RELEASE:STRING="" \
  -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
  -DCMAKE_SKIP_RPATH:BOOL=NO \
  -DBUILD_SHARED_LIBS=ON	-DBUILD=$BUILD ..
-%else
-%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/%{name}	\
+%endif
+%if 0%{?rhel} && 0%{?rhel} >= 7
+export CFLAGS="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DNDEBUG"
+export CXXFLAGS="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DNDEBUG"
+export LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now"
+%cmake3 -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/%{name} \
+ -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-z,now -fPIC -pie -Wl,--as-needed" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DNDEBUG" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="" \
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DCMAKE_SKIP_RPATH:BOOL=NO \
+ -DBUILD_SHARED_LIBS=ON	-DBUILD=$BUILD ..
+%endif
+%if 0%{?fedora}
+%cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/%{name} \
  -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,--as-needed" \
  -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
  -DCMAKE_SKIP_RPATH:BOOL=NO \
@@ -234,12 +243,11 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/bin/tableproxy%{__isa_bits}
 %check
 pushd build
 %if 0%{?rhel} && 0%{?rhel} > 6
-ctest%{cmake_ver} --force-new-ctest-process --parallel %{?_smp_mflags}
+ctest3 --force-new-ctest-process --parallel %{?_smp_mflags}
 %endif
 %if 0%{?rhel} && 0%{?rhel} < 7
-# ctest%%{cmake_ver} --force-new-ctest-process --parallel %{?_smp_mflags} -I 4,15,,1,17,28
 # https://github.com/ampl/mp/issues/103
-ctest%{cmake_ver} --force-new-ctest-process --parallel %{?_smp_mflags} -VV
+ctest3 --force-new-ctest-process --parallel %{?_smp_mflags} -I 4,15,,1,17,28
 %endif
 %if 0%{?fedora}
 ctest --force-new-ctest-process --parallel %{?_smp_mflags}
@@ -272,6 +280,9 @@ ctest --force-new-ctest-process --parallel %{?_smp_mflags}
 %{_includedir}/mp
 
 %changelog
+* Thu Nov 24 2016 Antonio Trande <sagitter@fedoraproject.org.com> - 3.1.0-5.20160810git1f3980
+- Skip gsl-test on epel6 (upstream issue #103)
+
 * Thu Nov 24 2016 Antonio Trande <sagitter@fedoraproject.org.com> - 3.1.0-4.20160810git1f3980
 - Update to commit #1f3980 (fmt updated to 3.0.1)
 - Patched for PPC64