Hello community, here is the log from the commit of package python-scipy for openSUSE:Factory checked in at 2019-02-14 14:36:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scipy (Old) and /work/SRC/openSUSE:Factory/.python-scipy.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scipy" Thu Feb 14 14:36:43 2019 rev:32 rq:674898 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scipy/python-scipy.changes 2019-01-24 14:12:42.991410839 +0100 +++ /work/SRC/openSUSE:Factory/.python-scipy.new.28833/python-scipy.changes 2019-02-14 14:36:49.267558575 +0100 @@ -1,0 +2,12 @@ +Tue Feb 12 08:55:55 UTC 2019 - Egbert Eich <[email protected]> + +- Properly create and tear down default version links when the + HPC master packages are installed/uninstalled. +- Make use of %hpc_modules_init to make modules also known to + client. +- Module file: + * remove PATH element. Package has no binary, + * make cosmetic changes. +- Remove use of %%python_module in dependency. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scipy.spec ++++++ --- /var/tmp/diff_new_pack.sdFh9s/_old 2019-02-14 14:36:50.903557839 +0100 +++ /var/tmp/diff_new_pack.sdFh9s/_new 2019-02-14 14:36:50.907557837 +0100 @@ -20,7 +20,8 @@ %define ver 1.2.0 %define _ver 1_2_0 -%define pname python-scipy +%define shortname scipy +%define pname python-%{shortname} %bcond_with ringdisabled @@ -77,6 +78,7 @@ %endif %{!?compiler_family:%global compiler_family gnu} %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} +%{hpc_modules_init openblas} %define package_name %{hpc_package_name %_ver} %define p_python_sitearch %hpc_python_sitearch %define p_prefix %hpc_prefix @@ -121,13 +123,13 @@ BuildRequires: lapacke-devel Requires: python-numpy >= 1.5.1 %else -BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel +BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel >= 1.3 BuildRequires: %{python_module numpy%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel} BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: lua-lmod -BuildRequires: suse-hpc -Requires: %{python_module numpy%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc} +BuildRequires: suse-hpc >= 0.3 Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc +Requires: python-numpy%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc >= 1.5.1 %endif %{?with_hpc:%{hpc_requires}} %python_subpackages @@ -163,7 +165,6 @@ %if %{with hpc} py_ver=%{$python_version} %hpc_setup -module load openblas module load python${py_ver/.*/}-numpy export CFLAGS="$(pkg-config --cflags openblas) %{optflags} -fno-strict-aliasing" LIBS="$(pkg-config --libs openblas)" export OPENBLAS=$OPENBLAS_LIB @@ -189,14 +190,13 @@ %if %{with hpc} py_ver=%{$python_version} %hpc_setup -module load openblas module load python${py_ver/.*/}-numpy %endif %__$python setup.py install --prefix=%{p_prefix} --root=%{buildroot} %fdupes %{buildroot}%{$python_sitearch} %if %{with hpc} -%define hpc_module_pname python${py_ver/.*/}-scipy +%define hpc_module_pname python${py_ver/.*/}-%{shortname} py_ver=%{$python_version} sitesearch_path=`$python -c "import sysconfig as s; print(s.get_paths(vars={'platbase':'%{hpc_prefix}','base':'%{hpc_prefix}'}).get('platlib'))"` rm -rf %{buildroot}${sitesearch_path}/scipy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests @@ -214,24 +214,28 @@ module-whatis "Name: %{pname} built with %{compiler_family} toolchain." module-whatis "Version: %{version}" module-whatis "Category: python module" -module-whatis "Description: %{summary}" +module-whatis "Description: %{SUMMARY}" module-whatis "URL %{url}" set version %{version} depends-on python${py_ver/.*/}-numpy -prepend-path PATH %{hpc_bindir} prepend-path PYTHONPATH ${sitesearch_path} setenv %{hpc_upcase_trans_hyph %pname}_DIR %{hpc_prefix} setenv %{hpc_upcase_trans_hyph %pname}_BIN %{hpc_bindir} -family "SciPy" +family %{shortname} EOF %endif } +%if %{with hpc} +%post +%hpc_module_delete_if_default +%endif + %files %{python_files} %license LICENSE.txt %{p_python_sitearch}/scipy/
