Update to 6.1.2

This commit is contained in:
Sandro Mani 2021-11-13 22:15:44 +01:00
parent 1fd05ebce6
commit 14ddf601a8
5 changed files with 23 additions and 21 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ scotch_5.1.8.tar.gz
/scotch_6.0.10.tar.gz
/scotch_6.1.0.tar.gz
/scotch_6.1.1.tar.gz
/scotch-v6.1.2.tar.bz2

View File

@ -1,6 +1,6 @@
diff -rupN scotch_6.1.1/src/check/Makefile scotch_6.1.1-new/src/check/Makefile
--- scotch_6.1.1/src/check/Makefile 2021-06-23 00:09:27.000000000 +0200
+++ scotch_6.1.1-new/src/check/Makefile 2021-06-24 14:19:39.161110960 +0200
diff -rupN --no-dereference scotch-v6.1.2/src/check/Makefile scotch-v6.1.2-new/src/check/Makefile
--- scotch-v6.1.2/src/check/Makefile 2021-11-13 11:07:54.000000000 +0100
+++ scotch-v6.1.2-new/src/check/Makefile 2021-11-13 21:44:21.161507721 +0100
@@ -68,7 +68,7 @@ include ../Makefile.inc
$(CC) $(CFLAGS) -I$(SCOTCHINCDIR) -L$(SCOTCHLIBDIR) $(<) -o $(@) $(SCOTCHLIBS) $(LDFLAGS)

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference scotch_6.1.1/src/esmumps/Makefile scotch_6.1.1-new/src/esmumps/Makefile
--- scotch_6.1.1/src/esmumps/Makefile 2021-06-21 00:22:12.000000000 +0200
+++ scotch_6.1.1-new/src/esmumps/Makefile 2021-06-24 12:35:37.191679393 +0200
diff -rupN --no-dereference scotch-v6.1.2/src/esmumps/Makefile scotch-v6.1.2-new/src/esmumps/Makefile
--- scotch-v6.1.2/src/esmumps/Makefile 2021-11-13 11:07:54.000000000 +0100
+++ scotch-v6.1.2-new/src/esmumps/Makefile 2021-11-13 21:44:21.098507670 +0100
@@ -196,7 +196,7 @@ symbol_fax_graph$(OBJ) : symbol_fax_gra
fax.h
@ -10,10 +10,10 @@ diff -rupN --no-dereference scotch_6.1.1/src/esmumps/Makefile scotch_6.1.1-new/s
-$(RANLIB) $(@)
main_esmumps$(EXE) : main_esmumps.c \
diff -rupN --no-dereference scotch_6.1.1/src/libscotch/Makefile scotch_6.1.1-new/src/libscotch/Makefile
--- scotch_6.1.1/src/libscotch/Makefile 2021-06-22 13:55:57.000000000 +0200
+++ scotch_6.1.1-new/src/libscotch/Makefile 2021-06-24 12:35:37.191679393 +0200
@@ -3121,26 +3121,26 @@ ptscotchf.h : ptdummysizes$(EXE) \
diff -rupN --no-dereference scotch-v6.1.2/src/libscotch/Makefile scotch-v6.1.2-new/src/libscotch/Makefile
--- scotch-v6.1.2/src/libscotch/Makefile 2021-11-13 11:07:54.000000000 +0100
+++ scotch-v6.1.2-new/src/libscotch/Makefile 2021-11-13 21:44:21.098507670 +0100
@@ -3119,26 +3119,26 @@ ptscotchf.h : ptdummysizes$(EXE) \
library_pt_f.h
./ptdummysizes$(EXE) "-s$(SCOTCH_NAME_SUFFIX)" library_pt_f.h ptscotchf.h
@ -48,9 +48,9 @@ diff -rupN --no-dereference scotch_6.1.1/src/libscotch/Makefile scotch_6.1.1-new
- $(AR) $(ARFLAGS) $(@) $(?)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS)
-$(RANLIB) $(@)
diff -rupN --no-dereference scotch_6.1.1/src/libscotchmetis/Makefile scotch_6.1.1-new/src/libscotchmetis/Makefile
--- scotch_6.1.1/src/libscotchmetis/Makefile 2021-06-23 00:09:27.000000000 +0200
+++ scotch_6.1.1-new/src/libscotchmetis/Makefile 2021-06-24 12:35:37.191679393 +0200
diff -rupN --no-dereference scotch-v6.1.2/src/libscotchmetis/Makefile scotch-v6.1.2-new/src/libscotchmetis/Makefile
--- scotch-v6.1.2/src/libscotchmetis/Makefile 2021-11-13 11:07:54.000000000 +0100
+++ scotch-v6.1.2-new/src/libscotchmetis/Makefile 2021-11-13 21:44:21.099507671 +0100
@@ -187,7 +187,7 @@ libptscotchparmetis$(LIB) : parmetis_dgr
parmetis_dgraph_order_f$(OBJ) \
parmetis_dgraph_part$(OBJ) \

View File

@ -9,13 +9,12 @@
Name: scotch
Summary: Graph, mesh and hypergraph partitioning library
Version: 6.1.1
Release: 2%{?dist}
Version: 6.1.2
Release: 1%{?dist}
License: CeCILL-C
URL: https://gforge.inria.fr/projects/scotch/
# Note: this URL needs to be adjusted for every release, as the file ID changes every time
Source0: https://gforge.inria.fr/frs/download.php/file/38443/scotch_6.1.1.tar.gz
URL: https://gitlab.inria.fr/scotch/scotch
Source0: https://gitlab.inria.fr/scotch/scotch/-/archive/v%{version}/scotch-v%{version}.tar.bz2
Source1: scotch-Makefile.shared.inc.in
# Make shared libraries link properly with -Wl,--as-needed
@ -111,8 +110,7 @@ This package contains the parmetis compatibility header for scotch.
###############################################################################
%prep
# NOTE: If the archive prefix folder does not match %%{name}_%%{version}, then the file ID in the Source URL is likely wrong!
%autosetup -p1 -n %{name}_%{version}
%autosetup -p1 -n %{name}-v%{version}
cp -a %{SOURCE1} src/Makefile.inc
@ -272,6 +270,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C src/check
%doc doc/scotch_example.f
%changelog
* Sat Nov 13 2021 Sandro Mani <manisandro@gmail.com> - 6.1.2-1
- Update to 6.1.2
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (scotch_6.1.1.tar.gz) = 1fc77443ac1e4dad37bc51128bb04463606d96e73f57fe3dce80231f2b80a48ee2c2f129a1df29cd1ba1198f332ac70bef6d540703bf01451a4594a566406c3c
SHA512 (scotch-v6.1.2.tar.bz2) = a59779523e2e9a77612140dafd96d9c5ac381c1a8148f8b236f5f3a610c458b75d7d5d6d51443dc8764ebcf46939746a71e51d7d61278d808aeaec5f3e6d4006