From c3f30afdbf712665c8346c46f29fe115319c0ad2 Mon Sep 17 00:00:00 2001
From: jengelh <>
Date: Jun 23 2021 15:44:35 +0000
Subject: Update bliss to version 0.77 / rev 4 via SR 901359
https://build.opensuse.org/request/show/901359
by user jengelh + dimstar_suse
- Update to version 0.77:
---
diff --git a/.files b/.files
index 9734856..4a495ba 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 8c967a4..b9eda1f 100644
--- a/.rev
+++ b/.rev
@@ -23,4 +23,12 @@
- Modernize specfile.
725834
+
+ 3e947d91cef2c1372d201f5c4a7bd2e3
+ 0.77
+
+ dimstar_suse
+ - Update to version 0.77:
+ 901359
+
diff --git a/bliss-0.73.zip b/bliss-0.73.zip
deleted file mode 120000
index 3e3bc24..0000000
--- a/bliss-0.73.zip
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreihvppzsqbaubswvrmjeboae4dn5nd36np3h5ouobqh2hjrp27ypqq
\ No newline at end of file
diff --git a/bliss-0.77.zip b/bliss-0.77.zip
new file mode 120000
index 0000000..69e7ea8
--- /dev/null
+++ b/bliss-0.77.zip
@@ -0,0 +1 @@
+/ipfs/bafkreifmzc4yanhtb6wsjsex6ns2xwdgye6z6g5sa7rzrugk6e3iowlsuq
\ No newline at end of file
diff --git a/bliss-am.diff b/bliss-am.diff
deleted file mode 100644
index bd28d35..0000000
--- a/bliss-am.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Jan Engelhardt
-Date: 2017-09-14 20:25:36.486876745 +0200
-
-build: produce shared libraries
----
- Makefile.am | 16 ++++++++++++++++
- configure.ac | 9 +++++++++
- 2 files changed, 25 insertions(+)
-
-Index: bliss-0.73/Makefile.am
-===================================================================
---- /dev/null
-+++ bliss-0.73/Makefile.am
-@@ -0,0 +1,16 @@
-+ACLOCAL_AMFLAGS = -I m4
-+AM_CXXFLAGS = -Wall
-+bin_PROGRAMS = bliss bliss_gmp
-+lib_LTLIBRARIES = libbliss.la libbliss_gmp.la
-+bliss_SOURCES = bliss.cc
-+bliss_LDADD = libbliss.la
-+bliss_gmp_CPPFLAGS = -DBLISS_USE_GMP
-+bliss_gmp_SOURCES = ${bliss_SOURCES}
-+bliss_gmp_LDADD = libbliss_gmp.la
-+libbliss_la_SOURCES = defs.cc graph.cc partition.cc orbit.cc uintseqhash.cc heap.cc timer.cc utils.cc bliss_C.cc
-+libbliss_la_LDFLAGS = -release ${PACKAGE_VERSION}
-+libbliss_gmp_la_CPPFLAGS = -DBLISS_USE_GMP
-+libbliss_gmp_la_SOURCES = ${libbliss_la_SOURCES}
-+libbliss_gmp_la_LDFLAGS = ${libbliss_la_LDFLAGS}
-+libbliss_gmp_la_LIBADD = -lgmp
-+pkginclude_HEADERS = bignum.hh defs.hh graph.hh heap.hh kqueue.hh kstack.hh orbit.hh partition.hh timer.hh uintseqhash.hh utils.hh
-Index: bliss-0.73/configure.ac
-===================================================================
---- /dev/null
-+++ bliss-0.73/configure.ac
-@@ -0,0 +1,9 @@
-+AC_INIT([bliss], [0.73])
-+AC_CONFIG_AUX_DIR([build-aux])
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_PROG_INSTALL
-+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-+AC_PROG_CXX
-+LT_INIT([disable-static])
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
diff --git a/bliss-nodate.diff b/bliss-nodate.diff
index 18884eb..ee2cfba 100644
--- a/bliss-nodate.diff
+++ b/bliss-nodate.diff
@@ -3,19 +3,19 @@ Date: 2017-09-14 20:25:36.486876745 +0200
build: make build reproducible
---
- bliss.cc | 2 +-
+ src/bliss.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: bliss-0.73/bliss.cc
===================================================================
---- bliss-0.73.orig/bliss.cc
-+++ bliss-0.73/bliss.cc
-@@ -59,7 +59,7 @@ usage(FILE* const fp, const char* argv0)
+--- bliss-0.77/src/bliss.cc 2021-02-18 10:59:33.000000000 +0100
++++ new/src/bliss.cc 2021-06-03 01:19:33.276717579 +0200
+@@ -59,7 +59,7 @@
else program_name = argv0;
if(!program_name or *program_name == 0) program_name = "bliss";
-- fprintf(fp, "bliss version %s (compiled "__DATE__")\n", bliss::version);
+- fprintf(fp, "bliss version %s (compiled " __DATE__ ")\n", bliss::version);
+ fprintf(fp, "bliss version %s\n", bliss::version);
- fprintf(fp, "Copyright 2003-2015 Tommi Junttila\n");
+ fprintf(fp, "Copyright 2003-2021 Tommi Junttila\n");
fprintf(fp,
"\n"
diff --git a/bliss.changes b/bliss.changes
index fb18fa3..95c289d 100644
--- a/bliss.changes
+++ b/bliss.changes
@@ -1,4 +1,35 @@
-------------------------------------------------------------------
+Mon Jun 21 16:10:32 UTC 2021 - Jan Engelhardt
+
+- Set versioned cmake requirement
+
+-------------------------------------------------------------------
+Wed Jun 2 22:57:38 UTC 2021 - Ferdinand Thiessen
+
+- Update to version 0.77:
+ * set_color and copy methods in the C++ API
+ * precise group size computation also without GNU GMP
+ * no more exit-causing "fatal_errors", instead a standard exception
+ is thrown
+- Update to version 0.76:
+ * The monolithic "graph" file is split in "abstractgraph",
+ "graph" and "digraph".
+ * defs.hh now contains the version number as a #define.
+ * is_automorphism is now a public member of Graph and Digraph.
+- Update to version 0.75:
+ * Automorphism reporting and termination check functions
+ are now of C++ type std::function.
+ * Bignum allows one to get a copy of internal GNU GMP integer.
+- Update to version 0.74:
+ * Fixed a memory leak
+ * Possibility to terminate the search early
+ * Minor changes for better C++11 compatibility.
+ * Memory allocation failures now throw std::bad_alloc
+- Drop bliss-am.diff upstream uses cmake
+- Add cmake.patch, allow installing the library and binary.
+- Refresh bliss-nodate.diff
+
+-------------------------------------------------------------------
Sat Aug 24 15:50:47 UTC 2019 - Jan Engelhardt
- Modernize specfile.
diff --git a/bliss.spec b/bliss.spec
index f371de7..464702b 100644
--- a/bliss.spec
+++ b/bliss.spec
@@ -1,7 +1,7 @@
#
# spec file for package bliss
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,18 @@
#
+%define lname libbliss0_77
Name: bliss
-%define lname libbliss-0_73
-Version: 0.73
+Version: 0.77
Release: 0
Summary: A Tool for Computing Automorphism Groups and Canonical Labelings of Graphs
License: LGPL-3.0-only
Group: Productivity/Scientific/Math
-URL: http://www.tcs.hut.fi/Software/bliss/
-
-Source: http://www.tcs.hut.fi/Software/bliss/%name-%version.zip
-Patch1: bliss-am.diff
-Patch2: bliss-nodate.diff
-BuildRequires: automake
+URL: https://users.aalto.fi/~tjunttil/bliss/
+Source: https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-%version.zip
+Patch1: bliss-nodate.diff
+Patch2: cmake.patch
+BuildRequires: cmake >= 3.5
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: libtool
@@ -63,13 +62,11 @@ applications that want to make use of the Bliss library.
%autosetup -p1
%build
-autoreconf -fi
-%configure
-make %{?_smp_mflags}
+%cmake -DUSE_GMP=ON -DBUILD_STATIC=OFF
+%cmake_build
%install
-%make_install
-rm -f "%buildroot/%_libdir"/*.la
+%cmake_install
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
@@ -79,12 +76,11 @@ rm -f "%buildroot/%_libdir"/*.la
%_bindir/bliss*
%files -n %lname
-%_libdir/libbliss-0.73.so
-%_libdir/libbliss_gmp-0.73.so
+%_libdir/libbliss.so.%version
%files devel
+%doc CHANGES.txt README.txt
%_libdir/libbliss.so
-%_libdir/libbliss_gmp.so
%_includedir/bliss/
%changelog
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..17ba515
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,67 @@
+Date: Wed Jun 2 22:57:38 UTC 2021
+From: Ferdinand Thiessen
+
+Allow installing libraries (reported upstream 2021-06-03)
+
+diff -Nur bliss-0.77/CMakeLists.txt new/CMakeLists.txt
+--- bliss-0.77/CMakeLists.txt 2021-02-18 10:59:33.000000000 +0100
++++ new/CMakeLists.txt 2021-06-03 01:45:35.260180830 +0200
+@@ -1,9 +1,11 @@
+ cmake_minimum_required(VERSION 3.5)
+
+ # set the project name
+-project(bliss)
++project(bliss VERSION 0.77)
+
+ option(USE_GMP "Use GNU Multiple Precision Arithmetic library" OFF)
++option(BUILD_SHARED "Build bliss as shared library" ON)
++option(BUILD_STATIC "Build bliss as static library" ON)
+
+ # specify the C++ standard
+ set(CMAKE_CXX_STANDARD 11)
+@@ -47,18 +49,38 @@
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+ endif(MSVC)
+
++if (BUILD_SHARED)
++ # Add the shared library
++ add_library(bliss SHARED ${BLISS_SOURCE_FILES})
++ set_target_properties(bliss PROPERTIES VERSION ${PROJECT_VERSION} POSITION_INDEPENDENT_CODE 1)
++ target_link_libraries(bliss ${GMP_LIBRARIES})
++ install(TARGETS bliss LIBRARY)
++endif()
+
+-# Add the shared library
+-add_library(bliss SHARED ${BLISS_SOURCE_FILES})
+-set_property(TARGET bliss PROPERTY POSITION_INDEPENDENT_CODE 1)
+-
+-# Add the static library
+-add_library(bliss_static STATIC ${BLISS_SOURCE_FILES})
++if (BUILD_STATIC)
++ # Add the static library
++ add_library(bliss_static STATIC ${BLISS_SOURCE_FILES})
++ install(TARGETS bliss_static LIBRARY)
++endif()
+
+ # Add the executable
+ add_executable(bliss-executable src/bliss.cc)
+-target_link_libraries(bliss-executable bliss_static)
++if (BUILD_SHARED)
++ target_link_libraries(bliss-executable bliss)
++else()
++ target_link_libraries(bliss-executable bliss_static)
++endif()
++
+ if(USE_GMP)
+ target_link_libraries(bliss-executable ${GMP_LIBRARIES})
+ endif(USE_GMP)
+ set_target_properties(bliss-executable PROPERTIES OUTPUT_NAME bliss)
++
++install(TARGETS bliss-executable RUNTIME)
++
++# Install header files
++install(DIRECTORY src/
++ DESTINATION include/bliss
++ FILES_MATCHING PATTERN "*.hh"
++)
++