Hello community, here is the log from the commit of package scotch for openSUSE:Factory checked in at 2019-07-05 13:48:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scotch (Old) and /work/SRC/openSUSE:Factory/.scotch.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scotch" Fri Jul 5 13:48:35 2019 rev:2 rq:674944 version:6.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/scotch/scotch.changes 2019-01-26 22:22:48.030836994 +0100 +++ /work/SRC/openSUSE:Factory/.scotch.new.4615/scotch.changes 2019-07-05 13:48:36.241442747 +0200 @@ -1,0 +2,18 @@ +Thu Feb 14 09:17:41 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Fix the package group fix. + +------------------------------------------------------------------- +Mon Feb 11 06:35:16 UTC 2019 - Egbert Eich <e...@suse.com> + +- Set default module version correctly when installing + master package, unset when deinstalling the default library + package. +- Fix dependencies for HPC packages. +- Fix HPC modulefile: library dir is always there when module file + is installed. +- Fix package groups. +- Cosmetic fixes to module file. +- Consolidate use of openmpi1, openmpi2, openmpi3 for non-HPC builds. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scotch.spec ++++++ --- /var/tmp/diff_new_pack.3skVBt/_old 2019-07-05 13:48:36.757443543 +0200 +++ /var/tmp/diff_new_pack.3skVBt/_new 2019-07-05 13:48:36.761443549 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %define base_pname scotch @@ -45,20 +46,21 @@ %if "%{flavor}" == "openmpi" %{?DisOMPI1} -%global mpi_family %{flavor} +%global mpi_family openmpi %bcond_with hpc +%define mpi_vers 1 %endif %if "%{flavor}" == "openmpi2" %{?DisOMPI2} -%global mpi_family %{flavor} +%global mpi_family openmpi %bcond_with hpc %define mpi_vers 2 %endif %if "%{flavor}" == "openmpi3" %{?DisOMPI3} -%global mpi_family %{flavor} +%global mpi_family openmpi %bcond_with hpc %define mpi_vers 3 %endif @@ -132,7 +134,12 @@ %{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}} %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} -%{?with_mpi:%{!?mpi_family:%global mpi_family openmpi}} +%{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}} + +# For compatibility package names +%if "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1" +%define mpi_ext %{?mpi_vers} +%endif %if %{without mpi} %define pname %{base_pname} @@ -144,7 +151,7 @@ %endif %if %{with hpc} -%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_family} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}} +%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_family} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} %define my_prefix %hpc_prefix %define my_bindir %hpc_bindir %define my_libdir %hpc_libdir @@ -160,8 +167,8 @@ %define my_incdir %_includedir %define my_mandir %_mandir %else - %global my_suffix -%{mpi_family}%{?mpi_ver} - %define my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ver} + %define my_suffix -%{mpi_family}%{?mpi_ext} + %define my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext} %define my_bindir %{my_prefix}/bin %define my_libdir %{my_prefix}/%{_lib}/ %define my_incdir %{my_prefix}/include/ @@ -173,10 +180,9 @@ %define f_name(ln:s:) %{-l:lib}%{pname}%{-n*}%{-s*}%{?my_suffix} %endif - Summary: Graph, mesh and hypergraph partitioning library License: CECILL-C -Group: Development/Libraries/C and C++ +Group: Productivity/Scientific/Math Name: %{package_name} Version: %{vers} Release: 0 @@ -188,19 +194,19 @@ BuildRequires: bison BuildRequires: fdupes BuildRequires: flex +BuildRequires: libbz2-devel BuildRequires: make BuildRequires: zlib-devel -BuildRequires: libbz2-devel %if %{without hpc} BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-fortran %if %{with mpi} -BuildRequires: %{mpi_family}%{?mpi_ver}-devel +BuildRequires: %{mpi_family}%{?mpi_ext}-devel %endif %else # hpc BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel -BuildRequires: lua-lmod +BuildRequires: lua-lmod >= 7.6.1 BuildRequires: suse-hpc >= 0.2 Requires: %{f_name -l -s %{so_ver}} = %version %if %{with mpi} @@ -212,22 +218,26 @@ Scotch is a software package for graph and mesh/hypergraph partitioning and sparse matrix ordering. -%{?with_hpc:%{hpc_master_package}} +%{?with_hpc:%{hpc_master_package -L}} %package -n %{f_name -l -s %{so_ver}} Summary: Graph, mesh and hypergraph partitioning library Group: System/Libraries -%if %{without hpc} && %{with mpi} +%if %{without hpc} + %if %{with mpi} BuildRequires: libscotch%{so_ver} Requires: libscotch%{so_ver} + %endif +%else +%hpc_requires +Requires: lua-lmod >= 7.6.1 %endif -%{?with_hpc:%hpc_requires} %description -n %{f_name -l -s %{so_ver}} Scotch is a software package for graph and mesh/hypergraph partitioning and sparse matrix ordering. -%{?with_hpc:%{hpc_master_package -l -n lib%{pname}%{hpc_package_name_tail}}} +%{?with_hpc:%{hpc_master_package -L -l -n lib%{pname}%{hpc_package_name_tail}}} %package devel Summary: Development libraries for scotch @@ -237,8 +247,8 @@ Requires: gcc-fortran %if %{with mpi} BuildRequires: scotch-devel +Requires: %{mpi_family}%{?mpi_ext}-devel Requires: scotch-devel -Requires: %{mpi_family}-devel %else Provides: scotch-devel = %{version} %endif @@ -250,7 +260,7 @@ %description devel This package contains development libraries for libscotch. -%{?with_hpc:%{hpc_master_package devel}} +%{?with_hpc:%{hpc_master_package -L devel}} %package devel-static Summary: Development libraries for scotch @@ -261,8 +271,6 @@ %description devel-static This package contains libscotch static libraries. -%{?with_hpc:%{hpc_master_package devel-static}} - %package -n %{f_name -n -%{metis}}-devel Summary: Development libraries for scotch Group: Development/Libraries/C and C++ @@ -367,13 +375,13 @@ puts stderr " " puts stderr "This module loads the Scotch library built with the %{compiler_family} compiler" -puts stderr "toolchain and the %{mpi_family} MPI stack." +puts stderr "toolchain and the %{mpi_family}%{?mpi_vers} MPI stack." puts stderr " " puts stderr "\nVersion %{version}\n" } -module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family} MPI" +module-whatis "Name: %{pname} built with %{compiler_family} compiler and %{mpi_family}%{?mpi_vers} MPI" module-whatis "Version: %{version}" module-whatis "Category: runtime library" module-whatis "Description: %{SUMMARY:0}" @@ -394,8 +402,8 @@ setenv %{hpc_upcase %pname}_BIN %{hpc_bindir} if {[file isdirectory %{hpc_includedir}]} { setenv %{hpc_upcase %pname}_LIB %{hpc_libdir} -setenv %{hpc_upcase %pname}_INC %{hpc_includedir} } +setenv %{hpc_upcase %pname}_INC %{hpc_includedir} EOF %endif # without hpc @@ -421,8 +429,10 @@ # HPC and MPI package install to non-standard locations: don't update cache %post -n %{f_name -l -s %so_ver} /sbin/ldconfig -N %{my_libdir} + %postun -n %{f_name -l -s %so_ver} /sbin/ldconfig -N %{my_libdir} +%{?with_hpc:%hpc_module_delete_if_default} %endif %files
