The package rpms/qrmumps.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qrmumps.git/commit/?id=f754c6379f....
Change:
-%ifnarch %{arm}
Thanks.
Full change:
============
commit f754c6379f5a7ea3da113a8d4ad1f5f2c2cc22ab
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Mon Nov 16 19:34:36 2020 +0100
Release 3.0
diff --git a/.gitignore b/.gitignore
index 7e6c669..98532a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/image_interp.tar.gz
/pltexpa.tar.gz
/qr_mumps-2.0.tgz
+/qr_mumps-3.0.tgz
diff --git a/qrmumps-Makefile.inc b/qrmumps-Makefile.inc
deleted file mode 100644
index acba953..0000000
--- a/qrmumps-Makefile.inc
+++ /dev/null
@@ -1,97 +0,0 @@
-##
##############################################################################################
-##
-## Copyright 2012 CNRS, INPT
-##
-## This file is part of qr_mumps.
-##
-## qr_mumps is free software: you can redistribute it and/or modify
-## it under the terms of the GNU Lesser General Public License as
-## published by the Free Software Foundation, either version 3 of
-## the License, or (at your option) any later version.
-##
-## qr_mumps is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU Lesser General Public License for more details.
-##
-## You can find a copy of the GNU Lesser General Public License
-## in the qr_mumps/doc directory.
-##
-##
##############################################################################################
-
-
-## -*- Makefile -*-
-##
-## $Date: 2016-07-07 22:22:30 +0100 $
-## $Author: sagitter AT
fedoraproject.org $
-## $Version: 1.1$
-## $Revision: 1 $
-##
-
-
-# write here the path to the qr_mumps top directory
-topdir=$(HOME)/path/to/here
-
-LINK = $(FC)
-
-CC = gcc
-FC = gfortran
-
-# remove the -fopenmp flag if you want a sequential version
-FCFLAGS = -O3 -fopenmp -fPIC
-CFLAGS = -O3 -fPIC
-
-LDFLAGS = $(FCFLAGS)
-INCLUDES = -I. -I../include $(INCBLAS)
-# CINCLUDES= $(IMETIS) $(ICOLAMD) $(ISTARPU)
-CINCLUDES= $(IMETIS) $(ICOLAMD)
-FINCLUDES= $(ISCOTCH)
-
-# this variable is for compilers that need a prefix before the -D flag (i.e., xlf)
-DEFINE_PREPEND =
-
-# you can specify here what ordering tools you have and if you want or not StarPU
parallelism
-# CDEFS = -Dhave_metis -Dhave_scotch -Dhave_colamd -Dhave_starpu
-# FDEFS = -Dhave_metis -Dhave_scotch -Dhave_colamd -Dhave_starpu
-CDEFS = -Dhave_metis -Dhave_scotch -Dhave_colamd
-FDEFS = -Dhave_metis -Dhave_scotch -Dhave_colamd
-
-AR = ar -cur
-RANLIB = ranlib
-
-# your StarPU library
-# LSTARPU = -L/path/to/starpu -lstarpu
-# ISTARPU = -I/path/to/starpu/include
-
-LBLAS = $(LIBBLAS)
-LLAPACK = $(LIBLAPACK)
-
-# your COLAMD library
-LCOLAMD = -lcolamd
-ICOLAMD = -I/usr/include/suitesparse
-
-# your METIS library
-LMETIS = -lmetis
-IMETIS = -I/usr/include
-
-# your scotch library
-LSCOTCH = -lscotch -lscotcherr
-ISCOTCH = -I/usr/include
-
-LIBS = $(LLAPACK) $(LBLAS) \
- $(LCOLAMD) $(LMETIS) \
- $(LSCOTCH) -lpthread
-
-%.mod: %.o
- @true
-
-%.o: %.c
- $(CC) $(CFLAGS) $(CINCLUDES) $(INCLUDES) $(CDEFS) $(PREC) -c $<
-%.o: %.f
- $(FC) $(FCFLAGS) $(FINCLUDES) $(INCLUDES) $(FDEFS) $(DEFINE_PREPEND)$(PREC) -c $<
-%.o: %.f90
- $(FC) $(FCFLAGS) $(FINCLUDES) $(INCLUDES) $(FDEFS) $(DEFINE_PREPEND)$(PREC) -c $<
-%.o: %.F
- $(FC) $(FCFLAGS) $(FINCLUDES) $(INCLUDES) $(FDEFS) $(DEFINE_PREPEND)$(PREC) -c $<
-%.o: %.F90
- $(FC) $(FCFLAGS) $(FINCLUDES) $(INCLUDES) $(FDEFS) $(DEFINE_PREPEND)$(PREC) -c $<
diff --git a/qrmumps-exclude_examples.patch b/qrmumps-exclude_examples.patch
deleted file mode 100644
index f3f1f57..0000000
--- a/qrmumps-exclude_examples.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile.orig 2016-02-18 12:15:16.000000000 +0100
-+++ b/Makefile 2020-08-16 19:50:50.558085857 +0200
-@@ -1,26 +1,21 @@
--all: setup lib examples
-+all: setup lib
-
- setup:
- (if test ! -d $(BUILD) ; then mkdir $(BUILD); fi)
- (if test ! -d $(BUILD)/src ; then mkdir $(BUILD)/src; fi)
- (if test ! -d $(BUILD)/lib ; then mkdir $(BUILD)/lib; fi)
- (if test ! -d $(BUILD)/include ; then mkdir $(BUILD)/include; fi)
-- (if test ! -d $(BUILD)/examples ; then mkdir $(BUILD)/examples; fi)
- (if test ! -d $(BUILD)/testing ; then mkdir $(BUILD)/testing; fi)
- (cp makeincs/Make.inc.$(PLAT) $(BUILD)/Make.inc)
- (cp aux/Makefile.build $(BUILD)/Makefile)
- (cp aux/Makefile.rules.inc $(BUILD)/src)
- (cp aux/Makefile.src $(BUILD)/src/Makefile)
-- (cp aux/Makefile.examples $(BUILD)/examples/Makefile)
- (cp aux/Makefile.testing $(BUILD)/testing/Makefile)
-
-
--.PHONY: lib examples
-+.PHONY: lib
-
- lib:
- (cd $(BUILD); $(MAKE) lib)
-
--examples:
-- (cd $(BUILD); $(MAKE) examples)
--
-
diff --git a/qrmumps-fix_libpaths+libsoname.patch b/qrmumps-fix_libpaths+libsoname.patch
new file mode 100644
index 0000000..41e3c3d
--- /dev/null
+++ b/qrmumps-fix_libpaths+libsoname.patch
@@ -0,0 +1,68 @@
+--- a/src/CMakeLists.orig.txt 2020-10-27 15:01:43.000000000 +0100
++++ b/src/CMakeLists.txt 2020-11-16 15:34:18.575070052 +0100
+@@ -84,9 +84,9 @@
+ add_dependencies(qrm_common qrm_api_headers)
+ add_dependencies(qrm_common qrm_internal_headers)
+ set_property(TARGET qrm_common PROPERTY Fortran_MODULE_DIRECTORY
${CMAKE_BINARY_DIR}/include)
+-set_property(TARGET qrm_common PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
)
+-set_property(TARGET qrm_common PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
)
+-install (TARGETS qrm_common EXPORT qrm-config DESTINATION lib)
++set_property(TARGET qrm_common PROPERTY ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX})
++set_property(TARGET qrm_common PROPERTY LIBRARY_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} )
++install (TARGETS qrm_common EXPORT qrm-config DESTINATION lib${LIB_SUFFIX})
+
+
+
+@@ -115,14 +115,14 @@
+ add_dependencies(${_arith}qrm qrm_api_headers)
+ add_dependencies(${_arith}qrm qrm_internal_headers)
+ set_property(TARGET ${_arith}qrm PROPERTY Fortran_MODULE_DIRECTORY
${CMAKE_BINARY_DIR}/include)
+- set_property(TARGET ${_arith}qrm PROPERTY ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib )
+- set_property(TARGET ${_arith}qrm PROPERTY LIBRARY_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib )
+- install (TARGETS ${_arith}qrm EXPORT qrm-config DESTINATION lib)
++ set_property(TARGET ${_arith}qrm PROPERTY ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} )
++ set_property(TARGET ${_arith}qrm PROPERTY LIBRARY_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} )
++ install (TARGETS ${_arith}qrm EXPORT qrm-config DESTINATION lib${LIB_SUFFIX})
+
+ endforeach()
+
+ export(EXPORT qrm-config FILE ${CMAKE_BINARY_DIR}/lib/qrm/qrm-config.cmake)
+-install(EXPORT qrm-config DESTINATION lib/qrm)
++install(EXPORT qrm-config DESTINATION lib${LIB_SUFFIX}/cmake/qrm)
+
+ add_subdirectory(include)
+
+--- a/src/CMakeLists.orig.txt 2020-11-16 16:32:01.586504000 +0100
++++ b/src/CMakeLists.txt 2020-11-16 16:32:28.121393300 +0100
+@@ -126,4 +126,4 @@
+
+ add_subdirectory(include)
+
+-install(DIRECTORY ${CMAKE_BINARY_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX}
PATTERN "CMakeFiles" EXCLUDE)
++install(DIRECTORY ${CMAKE_BINARY_DIR}/include/ DESTINATION
${LIB_INSTALL_DIR}/gfortran/modules/qrm USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN
"*.mod" PATTERN "CMakeFiles" EXCLUDE)
+--- a/include/CMakeLists.orig.txt 2020-10-27 15:01:43.000000000 +0100
++++ b/include/CMakeLists.txt 2020-11-16 16:10:14.642503709 +0100
+@@ -63,4 +63,4 @@
+ foreach(_hdr ${all_headers})
+ list(APPEND install_list ${CMAKE_CURRENT_BINARY_DIR}/${_hdr})
+ endforeach()
+-install(FILES ${install_list} DESTINATION include)
++install(FILES ${install_list} DESTINATION include/qrm)
+--- a/src/CMakeLists.orig.txt 2020-11-16 16:39:37.029680000 +0100
++++ b/src/CMakeLists.txt 2020-11-16 17:13:15.409030544 +0100
+@@ -83,6 +83,7 @@
+ target_include_directories(qrm_common PRIVATE ${CMAKE_BINARY_DIR}/src/include)
+ add_dependencies(qrm_common qrm_api_headers)
+ add_dependencies(qrm_common qrm_internal_headers)
++set_target_properties(qrm_common PROPERTIES LIBRARY_OUTPUT_NAME qrm_common SOVERSION
${QRM_VERSION_MAJOR} VERSION ${QRM_VERSION})
+ set_property(TARGET qrm_common PROPERTY Fortran_MODULE_DIRECTORY
${CMAKE_BINARY_DIR}/include)
+ set_property(TARGET qrm_common PROPERTY ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX})
+ set_property(TARGET qrm_common PROPERTY LIBRARY_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} )
+@@ -114,6 +115,7 @@
+ target_link_libraries(${_arith}qrm qrm_common ${LIBRARIES})
+ add_dependencies(${_arith}qrm qrm_api_headers)
+ add_dependencies(${_arith}qrm qrm_internal_headers)
++ set_target_properties(${_arith}qrm PROPERTIES LIBRARY_OUTPUT_NAME ${_arith}qrm
SOVERSION ${QRM_VERSION_MAJOR} VERSION ${QRM_VERSION})
+ set_property(TARGET ${_arith}qrm PROPERTY Fortran_MODULE_DIRECTORY
${CMAKE_BINARY_DIR}/include)
+ set_property(TARGET ${_arith}qrm PROPERTY ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} )
+ set_property(TARGET ${_arith}qrm PROPERTY LIBRARY_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} )
diff --git a/qrmumps-gcc10.patch b/qrmumps-gcc10.patch
deleted file mode 100644
index d23b9b2..0000000
--- a/qrmumps-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/utils/qrm_vecnrm.orig.F90 2016-06-29 14:39:53.000000000 +0200
-+++ b/src/utils/qrm_vecnrm.F90 2020-02-03 19:05:46.966820682 +0100
-@@ -143,7 +143,7 @@
- nrm = nrm + abs(vec(i))
- end do
- else if(qrm_str_tolower(ntype) .eq. '2') then
-- nrm = _rxnrm2(n, vec, 1)
-+ nrm = _rxnrm2(n, vec(1), 1)
- else
- err = 15
- call qrm_error_print(err, name)
diff --git a/qrmumps.spec b/qrmumps.spec
index 37ade65..fd5a47b 100644
--- a/qrmumps.spec
+++ b/qrmumps.spec
@@ -1,37 +1,19 @@
-# Testing
-%global with_check 1
-
-%if 0%{?fedora} >= 33
-%global blaslib flexiblas
-%else
-%global blaslib openblas
-%endif
+# Testing needs to be online
+%global with_check 0
Name: qrmumps
-Version: 2.0
-Release: 21%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Summary: A multithreaded multifrontal QR solver
License: LGPLv3+
URL:
http://buttari.perso.enseeiht.fr/qr_mumps/
# This is a private source link provided by upstream directly
-Source0:
http://buttari.perso.enseeiht.fr/qr_mumps/releases/%{version}/qr_mumps-%{...
-
-# Custom Makefile changed for Fedora and built from Make.inc/Makefile.gfortran.PAR in the
source.
-Source1: %{name}-Makefile.inc
-
-Patch0: %{name}-gcc10.patch
+Source0:
http://buttari.perso.enseeiht.fr/qr_mumps/releases/qr_mumps-%{version}.tgz
-# Exclude the examples
-Patch1: %{name}-exclude_examples.patch
-
-# Files for testing
-Source2:
http://www.cise.ufl.edu/research/sparse/MM/vanHeukelum/cage6.tar.gz
-Source3:
http://www.cise.ufl.edu/research/sparse/MM/Meszaros/pltexpa.tar.gz
-Source4:
http://www.cise.ufl.edu/research/sparse/MM/Yoshiyasu/image_interp.tar.gz
-
-BuildRequires: gcc-gfortran, valgrind
-BuildRequires: %{blaslib}-devel
+BuildRequires: gcc-gfortran, gcc-c++, gcc
+BuildRequires: cmake3
+BuildRequires: flexiblas-devel
BuildRequires: metis-devel >= 5.1.0-12
BuildRequires: scotch-devel
BuildRequires: suitesparse-devel
@@ -43,7 +25,10 @@ BuildRequires: perl-generators
Requires: gcc-gfortran%{?_isa}
Provides: qr_mumps = 0:%{version}-%{release}
-Obsoletes: qr_mumps < 0:2.0-4
+Obsoletes: qr_mumps < 0:3.0-1
+
+# Add libraries soname and fix the installation paths
+Patch0: %{name}-fix_libpaths+libsoname.patch
%description
qr_mumps is a software package for the solution of sparse,
@@ -64,6 +49,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Shared links and header files of %{name}.
+%package benchmarks
+Summary: Benchmark files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description benchmarks
+Benchamrks to evaluate the performance of {{{qrm}}} are provided in
+the =timing/= directory. These allow for running experiments on the
+solution of dense and sparse linear systems through the $QR$ and
+Cholesky factorizations. Use the =-h= command line argument to get
+help on using these benchmarks.
+
%package doc
Summary: PDF documentation files of %{name}
BuildArch: noarch
@@ -75,147 +70,52 @@ PDF documentation files of %{name}.
%prep
%autosetup -n qr_mumps-%{version} -p1
-# Do not build examples
-rm -rf src/examples
-
-cp -p %{SOURCE1} makeincs/Make.inc.fedora
-
%build
-export LIBBLAS=-l%{blaslib}
-export INCBLAS=-I%{_includedir}/%{blaslib}
-export FLEXIBLAS=netlib
-
-# Parallel Make is not supported
-make -j1 BUILD=build PLAT=fedora ARITH='d s c z' \
- topdir=$PWD \
- CC=gcc \
- FC=gfortran \
- FCFLAGS="%{build_fflags} -Wno-unused-variable -fopenmp -fPIC" \
- CFLAGS="%{build_cflags} -fopenmp -fPIC" \
- CDEFS=" -Dhave_metis -Dhave_scotch -Dhave_colamd" \
- FDEFS=" -Dhave_metis -Dhave_scotch -Dhave_colamd" \
- LCOLAMD=-lcolamd \
- ICOLAMD=" -I%{_includedir}/suitesparse" \
- LBLAS="%{__global_ldflags} $LIBBLAS" \
- INCBLAS=$INCBLAS \
- LLAPACK=$LIBLAPACK \
- LMETIS=" -lmetis" \
- IMETIS=" -I%{_includedir}" \
- LSCOTCH=" -lscotch -lscotcherr" \
- ISCOTCH=" -I%{_includedir}"
-
-# Make shared libraries
-pushd build/lib
-
-export LCOLAMD=-lcolamd
-export LMETIS=-lmetis
-export LSCOTCH="-lscotch -lscotcherr"
-
-gfortran -shared %{__global_ldflags} -fPIC -Wl,--whole-archive libqrm_common.a
-Wl,-no-whole-archive -L%{_libdir} $LMETIS $LCOLAMD -lgfortran -lm
-Wl,-soname,libqrm_common.so.%{version} -o libqrm_common.so.%{version}
-
-gfortran -shared %{__global_ldflags} -fPIC -Wl,--whole-archive libdqrm.a libqrm_common.a
-Wl,-no-whole-archive -L./ -lqrm_common -L%{_libdir} $LIBBLAS $LIBLAPACK $LSCOTCH $LMETIS
$LCOLAMD -lgfortran -lm -Wl,-soname,libdqrm.so.%{version} -o libdqrm.so.%{version}
+%cmake -Wno-dev -S . -DQRM_VERSION:STRING=%{version} \
+ -DARITH="d;s;z;c" -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DQRM_ORDERING_AMD:BOOL=ON -DQRM_ORDERING_METIS:BOOL=ON \
+ -DQRM_ORDERING_SCOTCH:BOOL=ON -DQRM_WITH_STARPU:BOOL=OFF \
+ -DQRM_WITH_CUDA:BOOL=OFF -DAMD_INCLUDE_DIRS:PATH=%{_includedir}/suitesparse \
+ -DBLAS_LIBRARIES_USER:STRING=%{_libdir}/libflexiblas.so \
+ -DBLAS_LDFLAGS_USER:STRING=%(pkg-config --libs flexiblas) \
+ -DBLAS_VERBOSE:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
+ -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES
+
+%cmake_build
-gfortran -shared %{__global_ldflags} -fPIC -Wl,--whole-archive libcqrm.a libqrm_common.a
-Wl,-no-whole-archive -L./ -lqrm_common -L%{_libdir} $LIBBLAS $LIBLAPACK $LSCOTCH $LMETIS
$LCOLAMD -lgfortran -lm -Wl,-soname,libcqrm.so.%{version} -o libcqrm.so.%{version}
-
-gfortran -shared %{__global_ldflags} -fPIC -Wl,--whole-archive libzqrm.a libqrm_common.a
-Wl,-no-whole-archive -L./ -lqrm_common -L%{_libdir} $LIBBLAS $LIBLAPACK $LSCOTCH $LMETIS
$LCOLAMD -lgfortran -lm -Wl,-soname,libzqrm.so.%{version} -o libzqrm.so.%{version}
-
-gfortran -shared %{__global_ldflags} -fPIC -Wl,--whole-archive libsqrm.a libqrm_common.a
-Wl,-no-whole-archive -L./ -lqrm_common -L%{_libdir} $LIBBLAS $LIBLAPACK $LSCOTCH $LMETIS
$LCOLAMD -lgfortran -lm -Wl,-soname,libsqrm.so.%{version} -o libsqrm.so.%{version}
-popd
-
-%ldconfig_scriptlets
+%install
+%cmake_install
%if 0%{?with_check}
%check
-pushd build/testing
-
-export LIBBLAS=-l%{blaslib}
-export INCBLAS=-I%{_includedir}/%{blaslib}
-export FLEXIBLAS=netlib
-
-make BUILD=./ PLAT=fedora ARITH='d s c z' \
- topdir=../../ \
- CC=gcc \
- FC=gfortran \
- FCFLAGS="-O2 -g -Wno-unused-variable -I%{_fmoddir} -fopenmp -fPIC -Wl,-z,now"
\
- CFLAGS="-O2 -g -fopenmp -fPIC -Wl,-z,now" \
- CDEFS=" -Dhave_metis -Dhave_scotch -Dhave_colamd" \
- FDEFS=" -Dhave_metis -Dhave_scotch -Dhave_colamd" \
- LCOLAMD=-lcolamd \
- ICOLAMD=" -I%{_includedir}/suitesparse" \
- LBLAS="%{__global_ldflags} $LIBBLAS" \
- INCBLAS=$INCBLAS \
- LLAPACK=$LIBLAPACK \
- LMETIS=" -lmetis" \
- IMETIS=" -I%{_includedir}" \
- LSCOTCH=" -lscotch -lscotcherr" \
- ISCOTCH=" -I%{_includedir}"
-
-echo 3 > matfile.txt
-tar -zxf %{SOURCE2}; echo cage6/cage6.mtx >> matfile.txt
-tar -zxf %{SOURCE3}; echo pltexpa/pltexpa.mtx >> matfile.txt
-tar -zxf %{SOURCE4}; echo image_interp/image_interp.mtx >> matfile.txt
-
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:%{_libdir}
-export QRM_NUM_THREADS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-./dqrm_testing
-./sqrm_testing
-./cqrm_testing
-
-# TEST 7 (pipe.) CASE 2 SUBCASE 1 MATRIX 13 : FAILED
-# Test failed
-# ERROR STOP
-# Error termination. Backtrace:
-# 0 0xb6a4838b in ???
-# 1 0xb6a491f3 in ???
-# 2 0xb6a4a493 in ???
-%ifnarch %{arm}
-./zqrm_testing
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+%ctest
%endif
-%endif
-
-%install
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}
-
-pushd build/lib
-install -pm 755 *.so.%{version} $RPM_BUILD_ROOT%{_libdir}
-
-ln -sf %{_libdir}/libqrm_common.so.%{version}
$RPM_BUILD_ROOT%{_libdir}/libqrm_common.so.2
-ln -sf %{_libdir}/libqrm_common.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libqrm_common.so
-
-ln -sf %{_libdir}/libdqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libdqrm.so.2
-ln -sf %{_libdir}/libdqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libdqrm.so
-
-ln -sf %{_libdir}/libcqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcqrm.so.2
-ln -sf %{_libdir}/libcqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcqrm.so
-
-ln -sf %{_libdir}/libzqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libzqrm.so.2
-ln -sf %{_libdir}/libzqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libzqrm.so
-
-ln -sf %{_libdir}/libsqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libsqrm.so.2
-ln -sf %{_libdir}/libsqrm.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libsqrm.so
-popd
-
-install -pm 644 build/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/
-install -pm 644 build/include/*.mod $RPM_BUILD_ROOT%{_fmoddir}/%{name}/
%files
%license doc/COPYING.LESSER
-%doc
Changelog.org
+%doc
Changelog.org README.org
%{_libdir}/lib*qrm.so.*
%{_libdir}/libqrm_common.so.*
%files devel
-%{_includedir}/%{name}/
-%{_fmoddir}/%{name}/
+%{_includedir}/qrm/
+%{_fmoddir}/qrm/
%{_libdir}/lib*qrm.so
%{_libdir}/libqrm_common.so
+%{_libdir}/cmake/qrm/
+
+%files benchmarks
+%{_bindir}/*qrm_*
%files doc
%license doc/COPYING.LESSER
-%doc doc/pdf/*.pdf
+%doc doc
%changelog
+* Mon Nov 16 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.0-1
+- Release 3.0
+
* Sun Aug 16 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 2.0-21
-
https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
- Exclude examples
diff --git a/sources b/sources
index d64cd16..57daf2d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (cage6.tar.gz) =
32af7979e8281404195753d3de7a077ea915613c63f08ff8a11afc8bcf5b30731921fdd1a2f032106e7735f97f98311a6bfb3f30dce4b63e96efce973ca43fd9
-SHA512 (image_interp.tar.gz) =
32b844942d05442451051a0b618eb93a44ac63e65032e7624f30da3fde2b77b3539a0d00c9ea86a15d0f917eace54e5daff399acd68e01f092e34675e03aa9a9
-SHA512 (pltexpa.tar.gz) =
78685eb1287d74c59a70f2bae2685d0cfc992f4146de45d76e3c2599a836f561596960161264b9f772ab8c767e9a29812a0e10ca0f3da764e31f4204514834a5
-SHA512 (qr_mumps-2.0.tgz) =
518ffb3aa56719eee3bb93d337ee142934b8e96720eb24e4828cefb80e93ff72fa09e101974beeec43b62f301863f66bf68515253e9d95bc727eee2ae7427dcd
+SHA512 (qr_mumps-3.0.tgz) =
c335fb417e14e773e1d32085b1409f78d11dd14a19b1dd02bdac9b8835cbc98dc3b011b5c1d89ba91aa3a21d18de91051ee5bdda314c2bb0f2b316e984588858