Accepting request 672775 from home:eeich:branches:science

- Set default module version correctly when installing
  master package, unset when deinstalling the default library
  package.
- make example make.inc work with non-HPC builds as well.

- Add superlu-examples_Makefile_remove_itersol.patch
      superlu-make.linux.patch:
  get a buildable examples test suite (bsc#1124765)
  fixing Makefile
  adding missing make.inc

OBS-URL: https://build.opensuse.org/request/show/672775
OBS-URL: https://build.opensuse.org/package/show/science/superlu?expand=0&rev=17

superlu-make.linux.patch

@@ -6,8 +6,8 @@
  #
 -SuperLUroot	= $(HOME)/Dropbox/Codes/SuperLU/SuperLU
 -SUPERLULIB   	= $(SuperLUroot)/lib/libsuperlu_5.1.a
-+SuperLUroot	= /usr
++SuperLUroot	= @superlu_home@
-+SUPERLULIB = /usr/lib/hpc/gnu7/superlu/5.?.?/lib64/libsuperlu.so
++SUPERLULIB	= @superlu_lib@
  
  #BLASLIB   	= $(SuperLUroot)/lib/libblas.a
  

superlu.changes

@@ -1,9 +1,19 @@
+-------------------------------------------------------------------
+Fri Feb  8 10:50:43 UTC 2019 - eich@suse.com
+
+- Set default module version correctly when installing
+  master package, unset when deinstalling the default library
+  package.
+- make example make.inc work with non-HPC builds as well.
+
 -------------------------------------------------------------------
 Fri Feb  8 09:40:33 UTC 2019 - Antoine Ginies <aginies@suse.com>
 
-- get a buildable examples test suite (bsc#1124765)
+- Add superlu-examples_Makefile_remove_itersol.patch
-    fixing Makefile
+      superlu-make.linux.patch:
-    adding missing make.inc
+  get a buildable examples test suite (bsc#1124765)
+  fixing Makefile
+  adding missing make.inc
 
 -------------------------------------------------------------------
 Tue Jan 22 11:58:01 UTC 2019 - eich@suse.com

superlu.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -46,12 +46,14 @@ ExclusiveArch:  do_not_build
 
 %define package_name %pname
 %if %{without hpc}
+%define p_prefix %_prefix
 %define p_includedir %_includedir
 %define p_libdir %_libdir
 %define _sover 5
 %else
 %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}}
 %define package_name %{hpc_package_name %_ver}
+%define p_prefix %hpc_prefix
 %define p_includedir %hpc_includedir
 %define p_libdir %hpc_libdir
 %endif
@@ -139,9 +141,9 @@ decomposition of sparse matrices.
 
 %if %{with hpc}
 %{hpc_master_package -l -L}
-%{hpc_master_package devel}
+%{hpc_master_package -L devel}
 %{hpc_master_package doc}
-%{hpc_master_package examples}
+%{hpc_master_package -L examples}
 %endif
 
 %prep
@@ -182,7 +184,8 @@ make clean
 rm -rf *itersol* .gitignore
 cd ..
 mv EXAMPLE examples
-cp MAKE_INC/make.linux make.inc
+cp MAKE_INC/make.linux examples/make.inc
+sed -i -e 's&@superlu_home@&%p_prefix&' -e 's&@superlu_lib@&%p_libdir&' examples/make.inc
 rm -f examples/.gitignore
 cp FORTRAN/README README.fortran
 %fdupes -s examples
@@ -232,6 +235,7 @@ EOF
 
 %postun -n lib%{name}%{?_sover}
 /sbin/ldconfig -N %hpc_libdir
+%hpc_module_delete_if_default
 %endif
 
 %files -n lib%{name}%{?_sover}