From 53c4744ca0128f5fb0956669abfd117790148951 Mon Sep 17 00:00:00 2001
From: Dave Love <loveshack@fedoraproject.org>
Date: Oct 25 2018 12:07:47 +0000
Subject: - Require scorep config [#1610849]

- Fix finding scorep.spec in square
- Some rpm spec cleanup

---

diff --git a/scalasca-square.patch b/scalasca-square.patch
new file mode 100644
index 0000000..6b2c3a9
--- /dev/null
+++ b/scalasca-square.patch
@@ -0,0 +1,15 @@
+--- scalasca-2.4/src/utils/square.in~	2018-05-14 12:31:02.329844522 +0100
++++ scalasca-2.4/src/utils/square.in	2018-10-24 10:25:26.690077467 +0100
+@@ -231,11 +231,10 @@
+         exit 1
+       fi
+       # Determine remapper specification file
+-      SCOREP_SPEC=
+       if [ -n ${SCOREP_CONFIG} ]; then
+         SCOREP_SPEC=`${SCOREP_CONFIG} --remap-specfile 2>/dev/null`
+       fi
+-      if [ -n "${SCOREP_SPEC}" -o ! -r "${SCOREP_SPEC}" ]; then
++      if [ -z "${SCOREP_SPEC}" -o ! -r "${SCOREP_SPEC}" ]; then
+         if [ -n "${SCORER}" ]; then
+           SCOREP_SPEC=`dirname ${SCORER}`/../share/scorep/scorep.spec
+         fi
diff --git a/scalasca.spec b/scalasca.spec
index 053a0f1..0a6b17d 100644
--- a/scalasca.spec
+++ b/scalasca.spec
@@ -29,7 +29,8 @@ Summary:	Toolset for performance analysis of large-scale parallel applications
 License:	BSD and GPLv3+
 URL:		http://www.scalasca.org/
 Source0:	http://apps.fz-juelich.de/scalasca/releases/scalasca/%shortver/dist/%name-%version.tar.gz
-
+# Fix logic for finding scorep.spec
+Patch1:		scalasca-square.patch
 BuildRequires:	otf2-devel >= 2.0, cube-devel >= 4.3
 BuildRequires:	zlib-devel openmpi-devel chrpath gcc-c++
 %if %{with mpich}
@@ -37,9 +38,9 @@ BuildRequires:	mpich-devel
 %endif
 # Necessary to run tests in epel7
 BuildRequires:	openssh-clients
-# scorep isn't necessary for the analyss or, necessarily, for
-# generating the input at all, so don't require.
-%{?fedora:Recommends:	scorep%{?_isa}}
+# Needed by square, to be moved out of the scorep package.
+# (The -instrument option is deprecated, so don't require/recommend scorep.)
+Requires:	%_datadir/scorep/scorep.spec
 
 %global desc \
 Scalasca is a software tool that supports the performance optimization\
@@ -60,7 +61,8 @@ suited for small- and medium-scale HPC platforms.
 %package openmpi
 Summary:	Toolset for performance analysis of large-scale parallel applications - openmpi
 Requires:	openmpi%{?_isa}
-%{?fedora:Recommends:	scorep-openmpi%{?_isa}}
+Requires:	%_libdir/openmpi/share/scorep/scorep.spec
+
 
 %description openmpi
 %desc
@@ -71,7 +73,7 @@ This is the openmpi version.
 %package mpich
 Summary:	Toolset for performance analysis of large-scale parallel applications - mpich
 Requires:	mpich%{?_isa}
-%{?fedora:Recommends:	scorep-openmpi%{?_isa}}
+Requires:	%_libdir/mpich/share/scorep/scorep.spec
 
 %description mpich
 %desc
@@ -90,6 +92,7 @@ Documentation for %name
 %setup -q
 mkdir openmpi mpich simple
 rm -r vendor/cubew vendor/otf2	# bundled libraries
+%patch1 -p1 -b .bak
 
 
 %build
@@ -98,7 +101,7 @@ rm -r vendor/cubew vendor/otf2	# bundled libraries
 %configure --with-otf2 --with-cube --enable-shared --libdir=$MPI_LIB \\\
 	   --bindir=$MPI_BIN --datadir=$MPI_HOME/share LDFLAGS=-Wl,--as-needed \\\
 	   --enable-backend-test-runs --disable-silent-rules \
-	   make %{?_smp_mflags}
+	   %make_build
 pushd openmpi
 %_openmpi_load
 %do_build
@@ -114,21 +117,18 @@ popd
 pushd simple
 %configure --with-otf2 --with-cube --enable-shared LDFLAGS=-Wl,--as-needed \
 	   --enable-backend-test-runs --disable-silent-rules --without-mpi
-make %{?_smp_mflags}
+%make_build
 popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install -C openmpi DESTDIR=$RPM_BUILD_ROOT
+%make_install -C openmpi
 %if %{with mpich}
-make install -C mpich DESTDIR=$RPM_BUILD_ROOT
+%make_install -C mpich
 %endif
-make install -C simple DESTDIR=$RPM_BUILD_ROOT
+%make_install -C simple
 
 find $RPM_BUILD_ROOT%_libdir \( -name \*.la -o -name \*.a \) -exec rm -f {} \;
-
-chrpath -d $RPM_BUILD_ROOT%_libdir/*/lib/libpearl.base.so.0 $RPM_BUILD_ROOT%_libdir/libpearl.base.so.0
 chrpath -d $RPM_BUILD_ROOT%_bindir/scout.{ser,omp}
 chrpath -d $RPM_BUILD_ROOT%_libdir/{openmpi,mpich}/bin/scout.{ser,omp}
 
@@ -175,8 +175,10 @@ make check VERBOSE=1
 
 
 %changelog
-* Sat Oct 20 2018 Dave Love <loveshack@fedoraproject.org> - 2.4-3
-- Recommend scorep [#1610849]
+* Wed Oct 24 2018 Dave Love <loveshack@fedoraproject.org> - 2.4-3
+- Require scorep config [#1610849]
+- Fix finding scorep.spec in square
+- Some rpm spec cleanup
 
 * Sat Jul 21 2018 Dave Love <loveshack@fedoraproject.org> - 2.4-2
 - BR gcc-c++ (#1606306)