From 46083a83bc476929769d5e99d8e07f29190da8f1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 20 May 2019 14:12:39 +0200 Subject: [PATCH] Update to 6.0.7 --- .gitignore | 1 + scotch-ldflags.patch | 20 ++++---- scotch-man.patch | 108 +++++++++++++++++++++---------------------- scotch.spec | 10 ++-- scotch_esmumps.patch | 2 +- sources | 2 +- 6 files changed, 74 insertions(+), 69 deletions(-) diff --git a/.gitignore b/.gitignore index d4f730d..fdda7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ scotch_5.1.8.tar.gz /scotch_6.0.4.tar.gz /scotch_6.0.5.tar.gz /scotch_6.0.6.tar.gz +/scotch_6.0.7.tar.gz diff --git a/scotch-ldflags.patch b/scotch-ldflags.patch index 079593e..87cd781 100644 --- a/scotch-ldflags.patch +++ b/scotch-ldflags.patch @@ -1,6 +1,6 @@ -diff -up scotch_6.0.6/src/esmumps/Makefile.ldflags scotch_6.0.6/src/esmumps/Makefile ---- scotch_6.0.6/src/esmumps/Makefile.ldflags 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/src/esmumps/Makefile 2019-04-12 12:29:40.901976055 -0600 +diff -rupN scotch_6.0.6/src/esmumps/Makefile scotch_6.0.6-new/src/esmumps/Makefile +--- scotch_6.0.6/src/esmumps/Makefile 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/src/esmumps/Makefile 2019-05-20 13:38:16.109735236 +0200 @@ -148,7 +148,7 @@ libesmumps$(LIB) : graph_graph$(OBJ) esmumps$(OBJ) \ esmumps_f$(OBJ) \ @@ -10,10 +10,10 @@ diff -up scotch_6.0.6/src/esmumps/Makefile.ldflags scotch_6.0.6/src/esmumps/Make -$(RANLIB) $(@) main_esmumps$(EXE) : main_esmumps.c \ -diff -up scotch_6.0.6/src/libscotch/Makefile.ldflags scotch_6.0.6/src/libscotch/Makefile ---- scotch_6.0.6/src/libscotch/Makefile.ldflags 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/src/libscotch/Makefile 2019-04-12 12:29:31.310136618 -0600 -@@ -3064,26 +3064,26 @@ +diff -rupN scotch_6.0.6/src/libscotch/Makefile scotch_6.0.6-new/src/libscotch/Makefile +--- scotch_6.0.6/src/libscotch/Makefile 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/src/libscotch/Makefile 2019-05-20 13:38:16.109735236 +0200 +@@ -3064,26 +3064,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 -up scotch_6.0.6/src/libscotch/Makefile.ldflags scotch_6.0.6/src/libscotch/ - $(AR) $(ARFLAGS) $(@) $(?) + $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) -$(RANLIB) $(@) -diff -up scotch_6.0.6/src/libscotchmetis/Makefile.ldflags scotch_6.0.6/src/libscotchmetis/Makefile ---- scotch_6.0.6/src/libscotchmetis/Makefile.ldflags 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/src/libscotchmetis/Makefile 2019-04-12 12:31:07.100533120 -0600 +diff -rupN scotch_6.0.6/src/libscotchmetis/Makefile scotch_6.0.6-new/src/libscotchmetis/Makefile +--- scotch_6.0.6/src/libscotchmetis/Makefile 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/src/libscotchmetis/Makefile 2019-05-20 13:38:16.110735234 +0200 @@ -139,12 +139,12 @@ libptscotchparmetis$(LIB) : parmetis_dgr parmetis_dgraph_order_f$(OBJ) \ parmetis_dgraph_part$(OBJ) \ diff --git a/scotch-man.patch b/scotch-man.patch index 082e3e3..b546282 100644 --- a/scotch-man.patch +++ b/scotch-man.patch @@ -1,123 +1,123 @@ -diff -up scotch_6.0.6/man/man1/amk_ccc.1.orig scotch_6.0.6/man/man1/amk_ccc.1 ---- scotch_6.0.6/man/man1/amk_ccc.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/amk_ccc.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/amk_ccc.1 scotch_6.0.6-new/man/man1/amk_ccc.1 +--- scotch_6.0.6/man/man1/amk_ccc.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/amk_ccc.1 2019-05-20 13:38:16.158735161 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH amk_ccc 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBamk_ccc, amk_fft2, amk_hy, amk_m2, amk_p2 \fP- create target architectures -diff -up scotch_6.0.6/man/man1/atst.1.orig scotch_6.0.6/man/man1/atst.1 ---- scotch_6.0.6/man/man1/atst.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/atst.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/atst.1 scotch_6.0.6-new/man/man1/atst.1 +--- scotch_6.0.6/man/man1/atst.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/atst.1 2019-05-20 13:38:16.158735161 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH atst 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBatst \fP- test the consistency of target architectures -diff -up scotch_6.0.6/man/man1/dgmap.1.orig scotch_6.0.6/man/man1/dgmap.1 ---- scotch_6.0.6/man/man1/dgmap.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/dgmap.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/dgmap.1 scotch_6.0.6-new/man/man1/dgmap.1 +--- scotch_6.0.6/man/man1/dgmap.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/dgmap.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH dgmap 1 "August 03, 2010" "" "PT-Scotch user's manual" .SH NAME \fBdgmap, dgpart \fP- compute static mappings and partitions in parallel -diff -up scotch_6.0.6/man/man1/dgord.1.orig scotch_6.0.6/man/man1/dgord.1 ---- scotch_6.0.6/man/man1/dgord.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/dgord.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/dgord.1 scotch_6.0.6-new/man/man1/dgord.1 +--- scotch_6.0.6/man/man1/dgord.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/dgord.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH dgord 1 "August 03, 2010" "" "PT-Scotch user's manual" .SH NAME \fBdgord \fP- compute sparse matrix orderings of graphs in parallel -diff -up scotch_6.0.6/man/man1/dgscat.1.orig scotch_6.0.6/man/man1/dgscat.1 ---- scotch_6.0.6/man/man1/dgscat.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/dgscat.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/dgscat.1 scotch_6.0.6-new/man/man1/dgscat.1 +--- scotch_6.0.6/man/man1/dgscat.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/dgscat.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH dgscat 1 "August 03, 2010" "" "PT-Scotch user's manual" .SH NAME \fBdgscat \fP- build distributed source graph file fragments from a centralized source graph file -diff -up scotch_6.0.6/man/man1/dgtst.1.orig scotch_6.0.6/man/man1/dgtst.1 ---- scotch_6.0.6/man/man1/dgtst.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/dgtst.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/dgtst.1 scotch_6.0.6-new/man/man1/dgtst.1 +--- scotch_6.0.6/man/man1/dgtst.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/dgtst.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH dgtst 1 "August 03, 2010" "" "PT-Scotch user's manual" .SH NAME \fBdgtst \fP- test the consistency of source graphs in parallel -diff -up scotch_6.0.6/man/man1/gcv.1.orig scotch_6.0.6/man/man1/gcv.1 ---- scotch_6.0.6/man/man1/gcv.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gcv.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gcv.1 scotch_6.0.6-new/man/man1/gcv.1 +--- scotch_6.0.6/man/man1/gcv.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gcv.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gcv 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgcv \fP- graph file converter -diff -up scotch_6.0.6/man/man1/gmap.1.orig scotch_6.0.6/man/man1/gmap.1 ---- scotch_6.0.6/man/man1/gmap.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gmap.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gmap.1 scotch_6.0.6-new/man/man1/gmap.1 +--- scotch_6.0.6/man/man1/gmap.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gmap.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gmap 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgmap, gpart \fP- compute static mappings and partitions sequentially -diff -up scotch_6.0.6/man/man1/gmk_hy.1.orig scotch_6.0.6/man/man1/gmk_hy.1 ---- scotch_6.0.6/man/man1/gmk_hy.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gmk_hy.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gmk_hy.1 scotch_6.0.6-new/man/man1/gmk_hy.1 +--- scotch_6.0.6/man/man1/gmk_hy.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gmk_hy.1 2019-05-20 13:38:16.159735160 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gmk_hy 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgmk_hy, gmk_m2, gmk_m3, gmk_ub2 \fP- create source graphs -diff -up scotch_6.0.6/man/man1/gmk_msh.1.orig scotch_6.0.6/man/man1/gmk_msh.1 ---- scotch_6.0.6/man/man1/gmk_msh.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gmk_msh.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gmk_msh.1 scotch_6.0.6-new/man/man1/gmk_msh.1 +--- scotch_6.0.6/man/man1/gmk_msh.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gmk_msh.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gmk_msh 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgmk_msh \fP- create source graph from source mesh -diff -up scotch_6.0.6/man/man1/gmtst.1.orig scotch_6.0.6/man/man1/gmtst.1 ---- scotch_6.0.6/man/man1/gmtst.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gmtst.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gmtst.1 scotch_6.0.6-new/man/man1/gmtst.1 +--- scotch_6.0.6/man/man1/gmtst.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gmtst.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gmtst 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgmtst \fP- compute statistics on mappings -diff -up scotch_6.0.6/man/man1/gord.1.orig scotch_6.0.6/man/man1/gord.1 ---- scotch_6.0.6/man/man1/gord.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gord.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gord.1 scotch_6.0.6-new/man/man1/gord.1 +--- scotch_6.0.6/man/man1/gord.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gord.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gord 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgord \fP- compute sparse matrix orderings of graphs -diff -up scotch_6.0.6/man/man1/gotst.1.orig scotch_6.0.6/man/man1/gotst.1 ---- scotch_6.0.6/man/man1/gotst.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gotst.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gotst.1 scotch_6.0.6-new/man/man1/gotst.1 +--- scotch_6.0.6/man/man1/gotst.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gotst.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gotst 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgomtst \fP- compute statistics on sparse matrix orderings -diff -up scotch_6.0.6/man/man1/gout.1.orig scotch_6.0.6/man/man1/gout.1 ---- scotch_6.0.6/man/man1/gout.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gout.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gout.1 scotch_6.0.6-new/man/man1/gout.1 +--- scotch_6.0.6/man/man1/gout.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gout.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man @@ -134,36 +134,36 @@ diff -up scotch_6.0.6/man/man1/gout.1.orig scotch_6.0.6/man/man1/gout.1 .PP .nf .fam C -diff -up scotch_6.0.6/man/man1/gtst.1.orig scotch_6.0.6/man/man1/gtst.1 ---- scotch_6.0.6/man/man1/gtst.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/gtst.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/gtst.1 scotch_6.0.6-new/man/man1/gtst.1 +--- scotch_6.0.6/man/man1/gtst.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/gtst.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH gtst 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBgtst \fP- test the consistency of source graphs -diff -up scotch_6.0.6/man/man1/mmk_m2.1.orig scotch_6.0.6/man/man1/mmk_m2.1 ---- scotch_6.0.6/man/man1/mmk_m2.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/mmk_m2.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/mmk_m2.1 scotch_6.0.6-new/man/man1/mmk_m2.1 +--- scotch_6.0.6/man/man1/mmk_m2.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/mmk_m2.1 2019-05-20 13:38:16.160735158 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH mmk_m2 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBmmk_m2, mmk_m3 \fP- create source meshes -diff -up scotch_6.0.6/man/man1/mord.1.orig scotch_6.0.6/man/man1/mord.1 ---- scotch_6.0.6/man/man1/mord.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/mord.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/mord.1 scotch_6.0.6-new/man/man1/mord.1 +--- scotch_6.0.6/man/man1/mord.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/mord.1 2019-05-20 13:38:16.161735157 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man .TH mord 1 "August 03, 2010" "" "Scotch user's manual" .SH NAME \fBmord \fP- compute sparse matrix orderings of meshes -diff -up scotch_6.0.6/man/man1/mtst.1.orig scotch_6.0.6/man/man1/mtst.1 ---- scotch_6.0.6/man/man1/mtst.1.orig 2018-07-14 09:24:49.000000000 -0600 -+++ scotch_6.0.6/man/man1/mtst.1 2018-07-14 09:24:49.000000000 -0600 +diff -rupN scotch_6.0.6/man/man1/mtst.1 scotch_6.0.6-new/man/man1/mtst.1 +--- scotch_6.0.6/man/man1/mtst.1 2018-07-14 17:24:49.000000000 +0200 ++++ scotch_6.0.6-new/man/man1/mtst.1 2019-05-20 13:38:16.161735157 +0200 @@ -1,4 +1,4 @@ -." Text automatically generated by txt2man +\" Text automatically generated by txt2man diff --git a/scotch.spec b/scotch.spec index 5e20ce7..0e9728b 100644 --- a/scotch.spec +++ b/scotch.spec @@ -9,8 +9,8 @@ Name: scotch Summary: Graph, mesh and hypergraph partitioning library -Version: 6.0.6 -Release: 6%{?dist} +Version: 6.0.7 +Release: 1%{?dist} License: CeCILL-C URL: https://gforge.inria.fr/projects/scotch/ @@ -109,7 +109,8 @@ This package contains the parmetis compatibility header for scotch. ############################################################################### %prep -%autosetup -p1 -n %{name}_%{version} +# FIXME They forgot to update the version in the tarball root foldername... +%autosetup -p1 -n %{name}_6.0.6 cp -a %{SOURCE1} src/Makefile.inc @@ -269,6 +270,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C src/check %doc doc/scotch_example.f %changelog +* Mon May 20 2019 Sandro Mani - 6.0.7-1 +- Update to 6.0.7 + * Fri Apr 12 2019 Jerry James - 6.0.6-6 - Fix underlinked libraries (bz 1680315) - Fix too-long description line diff --git a/scotch_esmumps.patch b/scotch_esmumps.patch index 2125af8..e1a5705 100644 --- a/scotch_esmumps.patch +++ b/scotch_esmumps.patch @@ -1,6 +1,6 @@ diff -rupN scotch_6.0.6/src/Makefile scotch_6.0.6-new/src/Makefile --- scotch_6.0.6/src/Makefile 2018-07-14 17:24:49.000000000 +0200 -+++ scotch_6.0.6-new/src/Makefile 2018-07-16 15:43:50.833428459 +0200 ++++ scotch_6.0.6-new/src/Makefile 2019-05-20 13:38:16.054735319 +0200 @@ -122,6 +122,8 @@ install : required $(bindir) $(includ -$(CP) -f ../include/*scotch*.h $(includedir) -$(CP) -f ../lib/*esmumps*$(LIB) $(libdir) diff --git a/sources b/sources index a5ebf64..2d3f734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scotch_6.0.6.tar.gz) = a98e0b01bf3d9fca62fb5e33bd8ca938e5994af86f3139d54100e797fc46536b9659e0861cbab7eac261521dbf49c549d7800a7af2d353c6546c9d96ebb16960 +SHA512 (scotch_6.0.7.tar.gz) = a98e0b01bf3d9fca62fb5e33bd8ca938e5994af86f3139d54100e797fc46536b9659e0861cbab7eac261521dbf49c549d7800a7af2d353c6546c9d96ebb16960