New upstream version.
This commit is contained in:
parent
2c44aa0c29
commit
d9f7206e4d
|
@ -236,7 +236,7 @@ Last-Update: 2016-04-20
|
||||||
|
|
||||||
--- a/directg.c
|
--- a/directg.c
|
||||||
+++ b/directg.c
|
+++ b/directg.c
|
||||||
@@ -380,6 +380,16 @@ scan(int level, int ne, int minarcs, int
|
@@ -383,6 +383,16 @@ scan(int level, int ne, int minarcs, int
|
||||||
return level-1;
|
return level-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -253,7 +253,7 @@ Last-Update: 2016-04-20
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -406,8 +416,7 @@ direct(graph *g, int nfixed, long minarc
|
@@ -409,8 +419,7 @@ direct(graph *g, int nfixed, long minarc
|
||||||
ne = 0;
|
ne = 0;
|
||||||
for (i = 0, gi = g; i < n; ++i, gi += m)
|
for (i = 0, gi = g; i < n; ++i, gi += m)
|
||||||
{
|
{
|
||||||
|
@ -1111,7 +1111,7 @@ Last-Update: 2016-04-20
|
||||||
if (thisdeg == 0) lab[++j0] = i;
|
if (thisdeg == 0) lab[++j0] = i;
|
||||||
--- a/naugraph.c
|
--- a/naugraph.c
|
||||||
+++ b/naugraph.c
|
+++ b/naugraph.c
|
||||||
@@ -173,16 +173,17 @@ updatecan(graph *g, graph *canong, int *
|
@@ -174,16 +174,17 @@ updatecan(graph *g, graph *canong, int *
|
||||||
* *
|
* *
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
@ -1132,7 +1132,7 @@ Last-Update: 2016-04-20
|
||||||
int i,c1,c2,labc1;
|
int i,c1,c2,labc1;
|
||||||
setword x;
|
setword x;
|
||||||
set *set1,*set2;
|
set *set1,*set2;
|
||||||
@@ -192,11 +193,9 @@ refine(graph *g, int *lab, int *ptn, int
|
@@ -193,11 +194,9 @@ refine(graph *g, int *lab, int *ptn, int
|
||||||
set *gptr;
|
set *gptr;
|
||||||
int maxcell,maxpos,hint;
|
int maxcell,maxpos,hint;
|
||||||
|
|
||||||
|
@ -1147,7 +1147,7 @@ Last-Update: 2016-04-20
|
||||||
|
|
||||||
longcode = *numcells;
|
longcode = *numcells;
|
||||||
split1 = -1;
|
split1 = -1;
|
||||||
@@ -324,7 +323,7 @@ refine(graph *g, int *lab, int *ptn, int
|
@@ -325,7 +324,7 @@ refine(graph *g, int *lab, int *ptn, int
|
||||||
|
|
||||||
longcode = MASH(longcode,*numcells);
|
longcode = MASH(longcode,*numcells);
|
||||||
*code = CLEANUP(longcode);
|
*code = CLEANUP(longcode);
|
||||||
|
@ -1156,7 +1156,7 @@ Last-Update: 2016-04-20
|
||||||
#endif /* else case of MAXM==1 */
|
#endif /* else case of MAXM==1 */
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
@@ -336,9 +335,8 @@ refine(graph *g, int *lab, int *ptn, int
|
@@ -337,9 +336,8 @@ refine(graph *g, int *lab, int *ptn, int
|
||||||
* *
|
* *
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
@ -1168,7 +1168,7 @@ Last-Update: 2016-04-20
|
||||||
{
|
{
|
||||||
int i,c1,c2,labc1;
|
int i,c1,c2,labc1;
|
||||||
setword x;
|
setword x;
|
||||||
@@ -348,10 +346,8 @@ refine1(graph *g, int *lab, int *ptn, in
|
@@ -349,10 +347,8 @@ refine1(graph *g, int *lab, int *ptn, in
|
||||||
set *gptr,workset0;
|
set *gptr,workset0;
|
||||||
int maxcell,maxpos,hint;
|
int maxcell,maxpos,hint;
|
||||||
|
|
||||||
|
@ -1181,7 +1181,7 @@ Last-Update: 2016-04-20
|
||||||
|
|
||||||
longcode = *numcells;
|
longcode = *numcells;
|
||||||
split1 = -1;
|
split1 = -1;
|
||||||
@@ -474,7 +470,7 @@ refine1(graph *g, int *lab, int *ptn, in
|
@@ -475,7 +471,7 @@ refine1(graph *g, int *lab, int *ptn, in
|
||||||
|
|
||||||
longcode = MASH(longcode,*numcells);
|
longcode = MASH(longcode,*numcells);
|
||||||
*code = CLEANUP(longcode);
|
*code = CLEANUP(longcode);
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
|
||||||
|
# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
|
||||||
|
|
||||||
|
# Spelling errors
|
||||||
|
addFilter(r'W: spelling-error .* (automorphism|geng|gtools|multigraphs|(N|n)auty)')
|
|
@ -1,9 +1,9 @@
|
||||||
%global nautybasever 2.6r11
|
%global nautybasever 2.6r12
|
||||||
%global nautytarver %(tr -d . <<< %{nautybasever})
|
%global nautytarver %(tr -d . <<< %{nautybasever})
|
||||||
|
|
||||||
Name: nauty
|
Name: nauty
|
||||||
Version: %(tr r . <<< %{nautybasever})
|
Version: %(tr r . <<< %{nautybasever})
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Graph canonical labeling and automorphism group computation
|
Summary: Graph canonical labeling and automorphism group computation
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
@ -123,6 +123,9 @@ make check
|
||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 15 2019 Jerry James <loganjerry@gmail.com> - 2.6.12-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.11-3
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.11-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (nauty26r11.tar.gz) = 673dc242e6e0a25d4f52c65c39248ec8910e89c0c169b1c22b6f49a56cf4bc465815c0a68c23373f0bb92665acc5e54371181fdeabd01a900b5fd615938a7e43
|
SHA512 (nauty26r12.tar.gz) = ac71af163bd2490171adea31bb3dec12a900c495365c069a5a7bbb42ca20d668bb4f319e9f9a43d85d6bd8b1842ff1a60dda5d2dc4cd89a902d78c40bfd6beb6
|
||||||
|
|
Loading…
Reference in New Issue