From 8cee592b821f4ecf77dc4e8fbce463c086277918 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 23 Oct 2017 19:07:16 -0600
Subject: [PATCH] New upstream version.

---
 .gitignore                   |  1 +
 nauty-autotoolization.patch  | 14 +++++++-------
 nauty-fix-gt_numorbits.patch |  2 +-
 nauty-popcnt.patch           |  6 +++---
 nauty.spec                   |  7 +++++--
 sources                      |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32a028d..80c6c81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /nauty26r5.tar.gz
 /nauty26r7.tar.gz
+/nauty26r10.tar.gz
diff --git a/nauty-autotoolization.patch b/nauty-autotoolization.patch
index e25c25b..a887ee0 100644
--- a/nauty-autotoolization.patch
+++ b/nauty-autotoolization.patch
@@ -39,10 +39,10 @@ Last-Update: 2016-03-19
  $2=1
  else
  $2=0
-@@ -57,10 +74,15 @@
- 
- dnl Checks for system features
- AC_CANONICAL_HOST
+@@ -77,10 +94,15 @@
+   *)
+      gccver=0.0.0 ;;
+ esac
 +AC_PATH_PROG([HELP2MAN],[help2man])
  
  dnl Checks for C compiler and sets CFLAGS if not set by user
@@ -55,9 +55,9 @@ Last-Update: 2016-03-19
  CFLAGS=$user_cflags
  MORECFLAGS=""
  dnl  we need  AC_SYS_LARGEFILE and AC_FUNC_FSEEKO
-@@ -434,6 +456,26 @@
- edit_msg="++++++ This file is automatically generated, don't edit it by hand! ++++++"
- AC_SUBST(edit_msg)
+@@ -400,6 +422,26 @@
+ echo CFLAGS=$CFLAGS
+ echo MORECFLAGS=$MORECFLAGS
  
 -AC_OUTPUT(makefile:makefile.in nauty.h:nauty-h.in
 -    naututil.h:naututil-h.in gtools.h:gtools-h.in)
diff --git a/nauty-fix-gt_numorbits.patch b/nauty-fix-gt_numorbits.patch
index b708e36..128095f 100644
--- a/nauty-fix-gt_numorbits.patch
+++ b/nauty-fix-gt_numorbits.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-11-22
  
 --- a/gtools-h.in
 +++ b/gtools-h.in
-@@ -273,6 +273,7 @@
+@@ -283,6 +283,7 @@
  extern TLS_ATTR char *readg_line;
  extern TLS_ATTR size_t ogf_linelen;
  extern TLS_ATTR boolean is_pipe;
diff --git a/nauty-popcnt.patch b/nauty-popcnt.patch
index 5daf3a6..d380f22 100644
--- a/nauty-popcnt.patch
+++ b/nauty-popcnt.patch
@@ -91,7 +91,7 @@ Last-Update: 2016-04-20
              {
 --- a/configure.ac
 +++ b/configure.ac
-@@ -300,6 +300,9 @@ dnl --disable-popcnt disables the use of
+@@ -263,6 +263,9 @@ dnl --disable-popcnt disables the use of
  AC_MSG_CHECKING(if popcnt instruction is available and requested)
  AC_ARG_ENABLE([popcnt],
     AS_HELP_STRING([--disable-popcnt], [Disable popcnt extensions]), [popcntarg=given], [popcntarg=notgiven])
@@ -101,7 +101,7 @@ Last-Update: 2016-04-20
  AS_IF([test "x$popcntarg" = "xnotgiven" -o "x$enable_popcnt" = "xyes"], [
  have_hwpopcnt=0
  test -e /proc/cpuinfo && grep -i popcnt /proc/cpuinfo >/dev/null && have_hwpopcnt=1 
-@@ -329,7 +333,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([#include
+@@ -293,7 +296,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([#include
  main(){unsigned int x; x = _mm_popcnt_u64(x);}])], [have_mmpop64=1], [have_mmpop64=0])
  AC_MSG_RESULT($have_mmpop64)
  ], [
@@ -109,7 +109,7 @@ Last-Update: 2016-04-20
  AC_MSG_CHECKING(if __builtin_popcount() is supported)
  AC_LINK_IFELSE([AC_LANG_SOURCE([main(){unsigned int x; x = __builtin_popcount(x);}])], [have_popcnt=1], [have_popcnt=0])
  AC_MSG_RESULT($have_popcnt)
-@@ -348,6 +351,7 @@ AC_SUBST(have_popcntl)
+@@ -312,6 +314,7 @@ AC_SUBST(have_popcntl)
  AC_SUBST(have_popcntll)
  AC_SUBST(have_mmpop32)
  AC_SUBST(have_mmpop64)
diff --git a/nauty.spec b/nauty.spec
index 7c7a721..f958da3 100644
--- a/nauty.spec
+++ b/nauty.spec
@@ -1,9 +1,9 @@
-%global nautybasever    2.6r7
+%global nautybasever    2.6r10
 %global nautytarver     %(tr -d . <<< %{nautybasever})
 
 Name:           nauty
 Version:        %(tr r . <<< %{nautybasever})
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Graph canonical labeling and automorphism group computation
 
 License:        ASL 2.0
@@ -125,6 +125,9 @@ make check
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 23 2017 Jerry James <loganjerry@gmail.com> - 2.6.10-1
+- New upstream version
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 8a5d108..33c3f7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2b18e03ea7698db3fbe06c5d76ad8fe  nauty26r7.tar.gz
+SHA512 (nauty26r10.tar.gz) = 013a3ab11f1c64af4b2a5e8c8994f8b71911c711cfe8dcd2b171dec14a8cad0a77e1b158dc37eaa1bfa79b3e2c645f30d02c27de5d37f74425c193af53a6e768