Accepting request 1310772 from science

- Update to release 2.9.1

OBS-URL: https://build.opensuse.org/request/show/1310772
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nauty?expand=0&rev=14

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1760208415
+commit: 8d1459332471634f31eb5b85d2c5abd7b3447ab075cf50a18e19c3fee8a746f9
+url: https://src.opensuse.org/jengelh/nauty
+revision: master

autoconf-2.72.patch

@@ -5,19 +5,18 @@ AC 2.72 changed the internals of AC_SYS_LARGEFILE. Just always build with largfi
 See also https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7643b42096da1f4403a501a4a5930dec2d1c88c2
 
 ---
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
 
-Index: nauty2_8_8/configure.ac
+Index: nauty2_9_1/configure.ac
 ===================================================================
---- nauty2_8_8.orig/configure.ac
-+++ nauty2_8_8/configure.ac
-@@ -170,7 +170,7 @@ CFLAGS=$user_cflags
- MORECFLAGS=""
- dnl  we need  AC_SYS_LARGEFILE and AC_FUNC_FSEEKO
- AC_SYS_LARGEFILE
--AS_IF([test "x$ac_cv_sys_file_offset_bits" = xno],[ac_cv_sys_file_offset_bits=0])
+--- nauty2_9_1.orig/configure.ac
++++ nauty2_9_1/configure.ac
+@@ -199,6 +199,7 @@ nauty_largefile=0
+ AS_IF([test "x$ac_cv_sys_largefile_opts" = "x-D_FILE_OFFSET_BITS=64"],[nauty_largefile=1])
+ AS_IF([test "x$ac_cv_sys_largefile_opts" = "x-D_LARGE_FILES=1"],[nauty_largefile=2])
+ AS_IF([test "x$ac_cv_sys_file_offset_bits" = "x"],[ac_cv_sys_file_offset_bits=0])
 +ac_cv_sys_file_offset_bits=64
- AC_SUBST(ac_cv_sys_file_offset_bits)
+ AS_IF([test "x$ac_cv_sys_largefile_source" = "xno"],[ac_cv_sys_largefile_source=0])
+ AS_IF([test "x$ac_cv_sys_largefile_source" = "x"],[ac_cv_sys_largefile_source=0])
  
- AS_IF([test "x$user_cflags" = x || test "x$user_cflags" = x-m32],

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4900900a0a312051e0fb5f5bde1813b140fda3ab9f463ab82519f7a40909b4b
+size 256

gcc15.patch

@@ -0,0 +1,28 @@
+From: Jan Engelhardt <ej@inai.de>
+Date: 2025-06-22 22:59:12.725516319 +0200
+
+gcc-15 for some reason stumbles over itself. If it had not ignored noreturn,
+there would be no reaching of end-of-function.
+Add a filler return statement.
+
+[   23s] nauty.h:1467:1: warning: 'noreturn' attribute ignored [-Wattributes]
+[   23s]  1467 | extern void NORET_ATTR alloc_error(const char*);
+[   23s] gtnauty.c: In function 'findarc':
+[   23s] gtnauty.c:942:1: error: control reaches end of non-void function [-Werror=return-type]
+
+---
+ gtnauty.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: nauty2_8_9/gtnauty.c
+===================================================================
+--- nauty2_8_9.orig/gtnauty.c
++++ nauty2_8_9/gtnauty.c
+@@ -939,6 +939,7 @@ findarc(arc *a, int na, int from, int to
+             lo = mid + 1;
+     }
+     gt_abort(">E findarc error\n");
++    return 0;
+ }
+ 
+ void

nauty-am.diff

@@ -1,26 +1,28 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: 2019-08-24 18:40 +0200
 
-build: produce shared libraries
-
 Partly based on Debian's upstream-autotoolization.patch.
----
- Makefile.am  |  122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac |   11 ++++-
- 2 files changed, 131 insertions(+), 2 deletions(-)
 
-Index: nauty2_8_8/Makefile.am
+`./configure --disable-static` is broken: make won't  run to completion.
+`./configure --enable-generic` is broken: still uses -march=native.
+Rewrite in automake.
+---
+ Makefile.am  |  123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac |   11 ++++-
+ 2 files changed, 132 insertions(+), 2 deletions(-)
+
+Index: nauty2_9_1/Makefile.am
 ===================================================================
 --- /dev/null
-+++ nauty2_8_8/Makefile.am
-@@ -0,0 +1,122 @@
++++ nauty2_9_1/Makefile.am
+@@ -0,0 +1,124 @@
 +ACLOCAL_AMFLAGS = -I m4
 +bin_PROGRAMS = addedgeg amtog assembleg biplabg catg checks6 complg converseg copyg \
 +	countg countneg cubhamg deledgeg delptg directg dreadnaut dretodot \
 +	dretog edgetransg genbg genbgL geng gengL genktreeg genquarticg \
 +	genrang genspecialg gentourng gentreeg hamheuristic labelg \
 +	linegraphg listg multig newedgeg NRswitchg pickg planarg ranlabg \
-+	ransubg shortg showg subdivideg twohamg underlyingg vcolg \
++	ransubg shortg showg subdivideg twohamg underlyingg uniqg vcolg \
 +	watercluster2
 +
 +nautyA1_flavor_CPPFLAGS = -DMAXN=WORDSIZE
@@ -88,6 +90,8 @@ Index: nauty2_8_8/Makefile.am
 +subdivideg_LDADD = libnauty.la
 +twohamg_LDADD = libnauty.la
 +underlyingg_LDADD = libnauty.la
++uniqg_SOURCES = uniqg.c nausha.c
++uniqg_LDADD = libnauty.la
 +vcolg_LDADD = libnauty.la
 +watercluster2_LDADD = libnauty.la
 +
@@ -136,13 +140,13 @@ Index: nauty2_8_8/Makefile.am
 +libnautyW1_la_SOURCES  = ${libnauty_la_SOURCES}
 +libnautyW1_la_LIBADD   = -lpthread
 +libnautyW1_la_LDFLAGS  = ${libnauty_la_LDFLAGS}
-Index: nauty2_8_8/configure.ac
+Index: nauty2_9_1/configure.ac
 ===================================================================
---- nauty2_8_8.orig/configure.ac
-+++ nauty2_8_8/configure.ac
+--- nauty2_9_1.orig/configure.ac
++++ nauty2_9_1/configure.ac
 @@ -1,6 +1,12 @@
  # Process this file with autoconf to produce a configure script.
- AC_INIT([nauty],[2.8.8])
+ AC_INIT([nauty],[2.9.1],[brendan.mckay@anu.edu.au])
  AC_CONFIG_SRCDIR([nauty-h.in])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AC_CONFIG_MACRO_DIR([m4])
@@ -153,26 +157,26 @@ Index: nauty2_8_8/configure.ac
  
  # ======================================================================
  # First we define some functions
-@@ -28,7 +34,7 @@ AC_DEFUN([CVT_YESNO],[if test "x$$1" = x
+@@ -26,7 +32,7 @@ AC_DEFUN([CVT_YESNO],[if test "x$$1" = x
  else
    $2=0
  fi
 -AC_SUBST($2)])
 +AC_SUBST([$2])])
  
- dnl Check for noreturn attribute
- AC_DEFUN([AX_NORET], [
-@@ -276,6 +282,7 @@ AC_SUBST(runonetestQ)
- AC_SUBST(Qlibs_or_null)
+ # Test for declaration with _POSIX_C_SOURCE=200809L and _XOPEN_SOURCE=500
+ 
+@@ -307,6 +313,7 @@ AC_SUBST(Qlibs_or_null)
+ AC_SUBST(TLSQlibs_or_null)
  AC_SUBST(testprogs)
  AC_SUBST(nautests)
 +AM_CONDITIONAL([HAVE_U128], [test "$ac_cv_sizeof___uint128_t" != "0"])
  
  dnl Checks for library functions.
  AC_CHECK_FUNC(isatty,have_isatty=1,have_isatty=0)
-@@ -517,7 +524,7 @@ AC_CHECK_PROGS(gunzip_prog,[gunzip],none
- AS_IF([test "$gunzip_prog" = "gunzip"],[have_gunzip=1],[have_gunzip=0])
- AC_SUBST(have_gunzip)
+@@ -571,7 +578,7 @@ AC_SUBST(have_gunzip)
+ 
+ LT_INIT
  
 -AC_CONFIG_FILES([makefile:makefile.in nauty.h:nauty-h.in
 +AC_CONFIG_FILES([Makefile nauty.h:nauty-h.in

nauty-uninitialized.diff

@@ -1,27 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2017-09-14 22:15:05.095341778 +0200
-
-patch some real bad code
-
-[   19s] traces.c: In function 'refine_tr_refine':
-[   19s] traces.c:5316:12: warning: 'TraceInd' is used uninitialized in this function [-Wuninitialized]
-[   19s]      return TraceInd;
-[   40s] checks6.c: In function 'seemsbad':
-[   40s] checks6.c:124:1: warning: control reaches end of non-void function [-Wreturn-type]
-[   40s]  }
----
- checks6.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: nauty2_8_8/checks6.c
-===================================================================
---- nauty2_8_8.orig/checks6.c
-+++ nauty2_8_8/checks6.c
-@@ -121,6 +121,7 @@ seemsbad(char *s)
-         else
-             return FALSE;
-     }
-+   return FALSE;
- }
- 
- /***********************************************************************/

nauty.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Sat Oct 11 18:46:48 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.9.1
+  * pickg/countg --HH counts hexagons (6-cycles) in undirected
+    graphs.
+  * Fixed pickg/countg documentation for colouring parameters.
+  * pickg/countg -Y works faster if an low upper limit is given.
+  * Added "c" option to genposetg to select only connected
+    posets.
+  * countneg -n (but not -e) can now handle incremental sparse
+    format.
+  * The space efficiency of uniqg has improved to 48 bytes per
+    isomorphism class.
+  * listg -T writes a one-line format like 0--1,2--3,... as
+    required by the program 'tutte'.
+  * dreadnaut: The options related to invariants have been
+    separated into options for digraphs and options for
+    undirected graphs. See online changelog for details.
+- Delete nauty-uninitialized.diff (merged)
+
+-------------------------------------------------------------------
+Sun Jun 22 21:03:59 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Add gcc15.patch
+
+-------------------------------------------------------------------
+Sun Feb  9 22:43:17 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.8.9
+  * There is a new utility uniqg for filtering by isomorphism
+    class. Use `uniqg --help` for full instructions.
+
 -------------------------------------------------------------------
 Fri May 17 06:22:51 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

nauty.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nauty
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,18 @@
 
 
 Name:           nauty
-%define lname   libnauty-2_8_8
-%define fuv     2_8_8
-Version:        2.8.8
+%define lname   libnauty-2_9_1
+%define fuv     2_9_1
+Version:        2.9.1
 Release:        0
 Summary:        Tools for computing automorphism groups of graphs
 License:        Apache-2.0
 Group:          Productivity/Scientific/Math
 URL:            https://pallini.di.uniroma1.it/
-
 Source:         https://pallini.di.uniroma1.it/nauty%fuv.tar.gz
 Patch1:         nauty-am.diff
-Patch2:         nauty-uninitialized.diff
 Patch3:         autoconf-2.72.patch
+Patch4:         gcc15.patch
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gmp-devel
@@ -72,26 +71,26 @@ applications that want to make use of libnauty.
 %autosetup -v -p1 -n nauty%fuv
 
 %build
-rm -f makefile
+rm -f aclocal.m4 makefile
 autoreconf -fi
-export CFLAGS="%optflags -Wno-unused"
-%configure --enable-generic
+#export CFLAGS="%optflags -Wno-unused"
+%configure --enable-generic --disable-popcnt --disable-clz
 %make_build
 
 %install
 %make_install
 rm -f "%buildroot/%_libdir"/*.la
-%fdupes %{buildroot}/${_bindir}
+%fdupes %buildroot/%_bindir
 
 %ldconfig_scriptlets -n %lname
 
 %files
 %_bindir/*
-%doc changes24-28.txt
+%doc changes24-29.txt
 %license COPYRIGHT
 
 %files -n %lname
-%_libdir/libnauty*-2.8.8.so
+%_libdir/libnauty*-%version.so
 
 %files devel
 %_includedir/nauty/