Accepting request 531172 from science:HPC

- Add more documentation.
- Fix LICENSE and copyright statement in LICENSE. (forwarded request 531169 from eeich)

OBS-URL: https://build.opensuse.org/request/show/531172
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-hpc?expand=0&rev=3

LICENSE

@@ -1,3 +1,5 @@
+Copyright © 2017 openSUSE Project
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -9,9 +11,9 @@ are met:
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
  
-3. Neither the name of Novell nor the names of its contributors may
+3. Neither the name of the copyright holder nor the names of its 
-   be used to endorse or promote products derived from this software
+   contributors may be used to endorse or promote products derived from 
-   without specific prior written permission.
+   this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

macros.hpc

@@ -18,7 +18,7 @@
 
 # For mpi libraries
 %hpc_mpi_install_base %{hpc_base}%{?hpc_cf_dir}mpi/
-%hpc_mpi_install_path_base %{hpc_mpi_install_base}%{hpc_mpi_family}/
+%hpc_mpi_install_path_base %{hpc_mpi_install_base}%{hpc_mpi_family}%{?hpc_ext}/
 %hpc_mpi_install_path %{hpc_mpi_install_path_base}%{version}
 
 # Different paths - below HPC directory
@@ -416,12 +416,23 @@ The package %{n_name}%{_p_ext} provides the dependency to get the latest version
 %_hpc_python_sysconfig_path() %(%1 -c "import sysconfig as s; \\\
      print(s.get_paths(%{?3:vars={'platbase':\\"%3\\", 'base' : \\"%3\\"}}).get('%2'));")
 
+# get the python version specific directory for arch specific files in the HPC
+# directory structure.
 %hpc_python_sitearch %{_hpc_python_sysconfig_path %python_flavor platlib %{?hpc_prefix}}
 
 %_hpc_python_ver() %(%1 -c "import sys as s;print(s.version[:3]);")
 
+# get the (abbreviated_) pythin version used for package and directory names.
 %hpc_python_version %{_hpc_python_ver %python_flavor}
 
+# %{hpc_python_master_package [-n <package_name>] [-g <group>] [-l][-L][-a]}
+# -n: specify a package name
+# -g: specify a group name
+# -l: mark the package as library package
+# -L: (for environment modules) create a link from the
+#    `.version.<version_no>` file  to the `.version`-file to
+#     mark the default version.
+# -a: mark package as architecture dependent
 %hpc_python_master_package(n:g:lLa) \
 %{?_python_macro_init} \
 %{lua: \
@@ -483,6 +494,7 @@ The package %{n_name}%{_p_ext} provides the dependency to get the latest version
 #
 # man pages
 #
+# %{hpc_compress_man <num>} compress man page in %hpc_mandir/man<num>
 %hpc_compress_man() \
      [ -n "%{*}" ] || { echo "no man page list!" >&2 ; exit 1; } \
      for j in %{*}; do \

suse-hpc.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct  4 08:15:18 UTC 2017 - eich@suse.com
+
+- Add more documentation.
+- Fix LICENSE and copyright statement in LICENSE.
+
+-------------------------------------------------------------------
+Thu Sep 21 15:10:29 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add %{?hpc_ext} to install path to allow multiple flavor installs
+
 -------------------------------------------------------------------
 Wed Sep 13 19:27:49 UTC 2017 - eich@suse.com
 

suse-hpc.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package suse_hpc
+# spec file for package suse-hpc
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -28,7 +28,7 @@ Source2:        hpc_elf.pl
 Source3:        hpc_elf.attr
 Source4:        hpc_elflib.attr
 Source5:        LICENSE
-Url:		http://www.suse.com/hpc
+Url:            http://www.suse.com/hpc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -57,5 +57,4 @@ cp %{S:5} .
 %{_rpmconfigdir}/hpc_elf.pl
 %{_rpmconfigdir}/fileattrs/*
 
-
 %changelog