From b7f229371e66eb91f96ea4810302be7315770430b7c16bbf9dfa74c8dfeff3d2 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 5 Nov 2020 21:47:02 +0000 Subject: [PATCH 1/3] Accepting request 846352 from home:anag:branches:science OBS-URL: https://build.opensuse.org/request/show/846352 OBS-URL: https://build.opensuse.org/package/show/science/superlu?expand=0&rev=27 --- superlu-5.2.2.tar.gz | 4 ++-- superlu.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/superlu-5.2.2.tar.gz b/superlu-5.2.2.tar.gz index ec2c27b..b5b931a 100644 --- a/superlu-5.2.2.tar.gz +++ b/superlu-5.2.2.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4339ba714c3ad2165d2b9a608114d3150921509fbc8757184a693ee4d4581abe -size 2595228 +oid sha256:0682bc8d6690fe8286595449a61bab55bf0c4775dc004ffeab09d2e12b599f90 +size 2595040 diff --git a/superlu.spec b/superlu.spec index 9d51cb6..6609334 100644 --- a/superlu.spec +++ b/superlu.spec @@ -88,7 +88,7 @@ Group: Productivity/Scientific/Math Version: %{ver} Release: 0 URL: https://portal.nersc.gov/project/sparse/superlu/ -Source0: superlu-5.2.2.tar.gz +Source0: https://github.com/xiaoyeli/superlu/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Tarball above is generated with the script below Source1: get-tarball.sh Source2: README.SUSE From bb64cce769ddd3dcedd0796e09fc2d70a8f44b30531bfede1c95267a28ac2268 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Fri, 6 Nov 2020 11:22:18 +0000 Subject: [PATCH 2/3] Accepting request 846434 from home:anag:branches:science revert OBS-URL: https://build.opensuse.org/request/show/846434 OBS-URL: https://build.opensuse.org/package/show/science/superlu?expand=0&rev=28 --- superlu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superlu.spec b/superlu.spec index 6609334..9d51cb6 100644 --- a/superlu.spec +++ b/superlu.spec @@ -88,7 +88,7 @@ Group: Productivity/Scientific/Math Version: %{ver} Release: 0 URL: https://portal.nersc.gov/project/sparse/superlu/ -Source0: https://github.com/xiaoyeli/superlu/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: superlu-5.2.2.tar.gz # Tarball above is generated with the script below Source1: get-tarball.sh Source2: README.SUSE From f22e43c088f37e5a58e201a9f2ffb6c18779c154864077e60689a65d09857f21 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Mon, 16 Nov 2020 15:25:35 +0000 Subject: [PATCH 3/3] Accepting request 848904 from home:anag:branches:science - Fix package name, re-add lines removed by mistake. This fix duplicate binary names. (boo#1178840) OBS-URL: https://build.opensuse.org/request/show/848904 OBS-URL: https://build.opensuse.org/package/show/science/superlu?expand=0&rev=30 --- superlu.changes | 6 ++++++ superlu.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/superlu.changes b/superlu.changes index 81d2c05..38a97b7 100644 --- a/superlu.changes +++ b/superlu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 16 14:41:49 UTC 2020 - Ana Guerrero Lopez + +- Fix package name, re-add lines removed by mistake. + This fix duplicate binary names. (boo#1178840) + ------------------------------------------------------------------- Mon Oct 26 14:11:13 UTC 2020 - Ana Guerrero Lopez diff --git a/superlu.spec b/superlu.spec index 9d51cb6..796398e 100644 --- a/superlu.spec +++ b/superlu.spec @@ -21,6 +21,7 @@ # Base package name %define pname superlu %define ver 5.2.2 +%define _ver %(echo %{ver} | tr . _) %if "%flavor" == "" ExclusiveArch: do_not_build @@ -75,6 +76,7 @@ ExclusiveArch: do_not_build %define libname lib%{name}%{?_sover} %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