From ac2dc434abef4ad1480427e06c3724b1cbcaee13 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 19 Jul 2021 13:25:05 -0600 Subject: [PATCH 01/20] Switch to github URLs. --- bliss.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bliss.spec b/bliss.spec index 41bd74c..a540355 100644 --- a/bliss.spec +++ b/bliss.spec @@ -7,8 +7,8 @@ Release: 14%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPLv3 -URL: http://www.tcs.hut.fi/Software/bliss/ -Source0: https://github.com/mkoeppe/bliss/archive/sage_package/%{version}+debian-%{debrel}+sage-%{pkgdate}.tar.gz +URL: https://github.com/mkoeppe/bliss +Source0: %{url}/archive/sage_package/%{version}+debian-%{debrel}+sage-%{pkgdate}.tar.gz # Man page written by Jerry James using text borrowed from the sources. # The man page therefore has the same copyright and license as the sources. Source1: bliss.1 @@ -88,6 +88,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Mon Jul 19 2021 Jerry James - 0.73-15 +- Switch to github URLs + * Tue Jan 26 2021 Fedora Release Engineering - 0.73-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8c56cad10da7f7e9d7e5e0d1ffcb6c5b199077bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:44:34 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From cae5bb8b44dbd8b6829dd5a07814bab1cde8cc50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:41:33 +0000 Subject: [PATCH 03/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index a540355..e126f7a 100644 --- a/bliss.spec +++ b/bliss.spec @@ -3,7 +3,7 @@ Name: bliss Version: 0.73 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPLv3 @@ -88,6 +88,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.73-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jul 19 2021 Jerry James - 0.73-15 - Switch to github URLs From 2e62169ff3927f705ef61114050e49cf6b6ad9f8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 7 Oct 2021 10:55:37 -0600 Subject: [PATCH 04/20] Version 0.77. Switch to new upstream URLs. --- README.md | 5 +++ bliss-rehn.patch | 84 ++++++++++++++---------------------------------- bliss.spec | 60 ++++++++++++++++++++-------------- sources | 2 +- 4 files changed, 67 insertions(+), 84 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..671fed1 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# bliss + +Bliss is an open source tool for computing automorphism groups and +canonical forms of graphs. It has both a command line user interface as +well as C++ and C programming language APIs. diff --git a/bliss-rehn.patch b/bliss-rehn.patch index 324cff7..b2ebf09 100644 --- a/bliss-rehn.patch +++ b/bliss-rehn.patch @@ -1,23 +1,6 @@ ---- graph.cc.orig 2016-08-02 23:48:05.000000000 -0600 -+++ graph.cc 2020-11-18 10:23:58.791980824 -0700 -@@ -608,16 +608,6 @@ public: - }; - - -- -- --typedef struct { -- unsigned int splitting_element; -- unsigned int certificate_index; -- unsigned int subcertificate_length; -- UintSeqHash eqref_hash; --} PathInfo; -- -- - void - AbstractGraph::search(const bool canonical, Stats& stats) - { -@@ -745,7 +735,6 @@ AbstractGraph::search(const bool canonic +--- src/abstractgraph.cc.orig 2021-02-18 02:59:34.000000000 -0700 ++++ src/abstractgraph.cc 2021-10-03 11:35:51.011616678 -0600 +@@ -745,7 +745,6 @@ AbstractGraph::search(const bool canonic initialize_certificate(); std::vector search_stack; @@ -25,7 +8,28 @@ std::vector best_path_info; search_stack.clear(); -@@ -3711,7 +3700,7 @@ Digraph::nucr_find_first_component(const +--- src/abstractgraph.hh.orig 2021-02-18 02:59:34.000000000 -0700 ++++ src/abstractgraph.hh 2021-10-03 11:45:07.075286913 -0600 +@@ -493,10 +493,14 @@ protected: + */ + unsigned int cr_component_elements; + ++ std::vector first_path_info; + ++public: + +- +- ++ /** ++ * Get an information vector about the first path. ++ */ ++ std::vector get_first_path_info() { return first_path_info; } + + }; + +--- src/graph.cc.orig 2021-02-18 02:59:34.000000000 -0700 ++++ src/graph.cc 2021-10-03 11:36:13.393644284 -0600 +@@ -1550,7 +1550,7 @@ Graph::nucr_find_first_component(const u component.clear(); component_elements = 0; sh_return = 0; @@ -34,41 +38,3 @@ unsigned int sh_size = 0; unsigned int sh_nuconn = 0; ---- graph.hh.orig 2016-08-02 23:48:05.000000000 -0600 -+++ graph.hh 2020-11-18 10:22:45.358042181 -0700 -@@ -109,9 +109,12 @@ public: - unsigned long int get_max_level() const {return max_level;} - }; - -- -- -- -+typedef struct { -+ unsigned int splitting_element; -+ unsigned int certificate_index; -+ unsigned int subcertificate_length; -+ UintSeqHash eqref_hash; -+} PathInfo; - - - /** -@@ -516,7 +519,7 @@ protected: - */ - unsigned int cr_component_elements; - -- -+ std::vector first_path_info; - - - }; -@@ -748,6 +751,10 @@ public: - void set_splitting_heuristic(const SplittingHeuristic shs) {sh = shs; } - - -+ /** -+ * Get an information vector about the first path. -+ */ -+ std::vector get_first_path_info() { return first_path_info; } - }; - - diff --git a/bliss.spec b/bliss.spec index e126f7a..f9a9e77 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,14 +1,11 @@ -%global pkgdate 2016-08-02 -%global debrel 1 - Name: bliss -Version: 0.73 -Release: 15%{?dist} +Version: 0.77 +Release: 1%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPLv3 -URL: https://github.com/mkoeppe/bliss -Source0: %{url}/archive/sage_package/%{version}+debian-%{debrel}+sage-%{pkgdate}.tar.gz +URL: https://users.aalto.fi/~tjunttil/bliss/ +Source0: %{url}/downloads/%{name}-%{version}.zip # Man page written by Jerry James using text borrowed from the sources. # The man page therefore has the same copyright and license as the sources. Source1: bliss.1 @@ -16,10 +13,10 @@ Source1: bliss.1 # performance enhancement. Patch0: bliss-rehn.patch +BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: gmp-devel -BuildRequires: libtool BuildRequires: make Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -27,13 +24,12 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description Bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as -well as C++ and C programming language APIs. +well as C++ and C programming language APIs. %package devel Summary: Headers and library files for developing with bliss Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} -Provides: bundled(jquery) %description devel Headers and library files needed to develop applications that use the @@ -47,27 +43,39 @@ A command-line bliss tool to access the functionality of the bliss library. %prep -%autosetup -p0 -n bliss-sage_package-%{version}-debian-%{debrel}-sage-%{pkgdate} -autoreconf -fi . +%autosetup -p0 + +# Do not override Fedora build flags. The last sagemath version added an +# soname. Duplicate it for compatibility. Link with GMP. +sed -e 's/ -O3//' \ + -e '/POSITION_INDEPENDENT/aset_target_properties(bliss PROPERTIES VERSION 2.0.0 SOVERSION 2)\ntarget_link_libraries(bliss gmp)' \ + -i CMakeLists.txt %build -%configure --disable-static - -# Get rid of undesirable hardcoded rpaths; workaround libtool reordering -# -Wl,--as-needed after all the libraries. -sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - -e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' \ - -i libtool - -%make_build +%cmake -DUSE_GMP:BOOL=ON . +%cmake_build # Build the documentation doxygen %install -%make_install -rm %{buildroot}%{_libdir}/*.la +# %%cmake_install does nothing, so install manually + +# Install the binary +cd %{_vpath_builddir} +mkdir -p %{buildroot}%{_bindir} +install -m 0755 -p bliss %{buildroot}%{_bindir} + +# Install the library +mkdir -p %{buildroot}%{_libdir} +install -m 0755 -p libbliss.so.2.0.0 %{buildroot}%{_libdir} +ln -s libbliss.so.2.0.0 %{buildroot}%{_libdir}/libbliss.so.2 +ln -s libbliss.so.2 %{buildroot}%{_libdir}/libbliss.so +cd .. + +# Install the header files +mkdir -p %{buildroot}%{_includedir}/%{name} +install -m 0644 -p src/*.hh %{buildroot}%{_includedir}/%{name} # Install the man page mkdir -p %{buildroot}%{_mandir}/man1 @@ -88,6 +96,10 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Thu Oct 7 2021 Jerry James - 0.77-1 +- Version 0.77 +- Switch to new upstream URLs + * Wed Jul 21 2021 Fedora Release Engineering - 0.73-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f84e737..3dddec5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.73+debian-1+sage-2016-08-02.tar.gz) = 6bebd421e2bade97bb98bc3baa7556f3f0ef357dd98a20096a90118e4eed919cb4ca9d4cb59b353f9b4cace215f699599f8b1c4e95843488bdc4019b670a185b +SHA512 (bliss-0.77.zip) = d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17 From 37f08de0bc9fcd20d79a6a551f2db4cc90126394 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:24:53 +0000 Subject: [PATCH 05/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index f9a9e77..3660ff5 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,6 +1,6 @@ Name: bliss Version: 0.77 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPLv3 @@ -96,6 +96,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.77-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Oct 7 2021 Jerry James - 0.77-1 - Version 0.77 - Switch to new upstream URLs From ee3e440473715be65fb32930f0e1b13250909250 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:04:07 +0000 Subject: [PATCH 06/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index 3660ff5..72b2e04 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,6 +1,6 @@ Name: bliss Version: 0.77 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPLv3 @@ -96,6 +96,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.77-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 0.77-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 547f37482ff093e2398c77563bc5033d4cbfe617 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 20 Jul 2022 16:27:51 -0600 Subject: [PATCH 07/20] Remove dot from %cmake invocation to fix FTBFS. --- bliss.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index 72b2e04..c73afbb 100644 --- a/bliss.spec +++ b/bliss.spec @@ -52,7 +52,7 @@ sed -e 's/ -O3//' \ -i CMakeLists.txt %build -%cmake -DUSE_GMP:BOOL=ON . +%cmake -DUSE_GMP:BOOL=ON %cmake_build # Build the documentation From 066f0a2cb763d4f6a1102b0105d5cb3de39cee61 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 15 Aug 2022 11:38:45 -0600 Subject: [PATCH 08/20] Convert License tag to SPDX. --- bliss.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index c73afbb..fe45447 100644 --- a/bliss.spec +++ b/bliss.spec @@ -3,7 +3,7 @@ Version: 0.77 Release: 3%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs -License: LGPLv3 +License: LGPL-3.0-only URL: https://users.aalto.fi/~tjunttil/bliss/ Source0: %{url}/downloads/%{name}-%{version}.zip # Man page written by Jerry James using text borrowed from the sources. @@ -27,6 +27,8 @@ canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs. %package devel +# The doxygen-generated content contains MIT-licensed files +License: LGPL-3.0-only AND MIT Summary: Headers and library files for developing with bliss Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} @@ -96,6 +98,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Mon Aug 15 2022 Jerry James - 0.77-3 +- Convert License tag to SPDX + * Wed Jul 20 2022 Fedora Release Engineering - 0.77-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From cd8680b6fe28c32f5a8a7eb6b13aec5032f31c43 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 22 Nov 2022 11:30:52 -0700 Subject: [PATCH 09/20] Clarify bliss-devel license. --- bliss.spec | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/bliss.spec b/bliss.spec index fe45447..5484411 100644 --- a/bliss.spec +++ b/bliss.spec @@ -27,8 +27,33 @@ canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs. %package devel -# The doxygen-generated content contains MIT-licensed files -License: LGPL-3.0-only AND MIT +# The content is LGPL-3.0-only. Other licenses are due to files installed by +# doxygen. +# html/bc_s.png: GPL-1.0-or-later +# html/bdwn.png: GPL-1.0-or-later +# html/closed.png: GPL-1.0-or-later +# html/doc.png: GPL-1.0-or-later +# html/doxygen.css: GPL-1.0-or-later +# html/doxygen.svg: GPL-1.0-or-later +# html/dynsections.js: MIT +# html/folderclosed.png: GPL-1.0-or-later +# html/folderopen.png: GPL-1.0-or-later +# html/jquery.js: MIT +# html/menu.js: MIT +# html/menudata.js: MIT +# html/nav_f.png: GPL-1.0-or-later +# html/nav_g.png: GPL-1.0-or-later +# html/nav_h.png: GPL-1.0-or-later +# html/open.png: GPL-1.0-or-later +# html/splitbar.png: GPL-1.0-or-later +# html/sync_off.png: GPL-1.0-or-later +# html/sync_on.png: GPL-1.0-or-later +# html/tab_a.png: GPL-1.0-or-later +# html/tab_b.png: GPL-1.0-or-later +# html/tab_h.png: GPL-1.0-or-later +# html/tab_s.png: GPL-1.0-or-later +# html/tabs.css: GPL-1.0-or-later +License: LGPL-3.0-only AND MIT AND GPL-1.0-or-later Summary: Headers and library files for developing with bliss Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} From d8bf91f1143179a02f803838be68e77985268676 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:58:18 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index 5484411..328605e 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,6 +1,6 @@ Name: bliss Version: 0.77 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -123,6 +123,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.77-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 15 2022 Jerry James - 0.77-3 - Convert License tag to SPDX From 4de9c8128311851f20c04bf7e2d9c48992487513 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:42:59 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index 328605e..ba655f1 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,6 +1,6 @@ Name: bliss Version: 0.77 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -123,6 +123,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.77-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.77-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 55be07512b4bc6a9a5ffade61a28fd835f960276 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:29:31 +0000 Subject: [PATCH 12/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index ba655f1..d9be659 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,6 +1,6 @@ Name: bliss Version: 0.77 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -123,6 +123,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.77-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.77-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 44dbaa0ac3d32c98e199b893d9301c0cce56d95a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:31:55 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index d9be659..7c67d96 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,6 +1,6 @@ Name: bliss Version: 0.77 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -123,6 +123,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 0.77-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.77-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3a843bd252e2bd89f59692d6f80de375dc4f5537 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 22 Feb 2024 10:09:49 -0700 Subject: [PATCH 14/20] Build the SCIP fork - Do not build for 32-bit x86 --- bliss-rehn.patch | 30 +++++++++++++++--------------- bliss.spec | 46 ++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/bliss-rehn.patch b/bliss-rehn.patch index b2ebf09..8879561 100644 --- a/bliss-rehn.patch +++ b/bliss-rehn.patch @@ -1,15 +1,5 @@ ---- src/abstractgraph.cc.orig 2021-02-18 02:59:34.000000000 -0700 -+++ src/abstractgraph.cc 2021-10-03 11:35:51.011616678 -0600 -@@ -745,7 +745,6 @@ AbstractGraph::search(const bool canonic - initialize_certificate(); - - std::vector search_stack; -- std::vector first_path_info; - std::vector best_path_info; - - search_stack.clear(); ---- src/abstractgraph.hh.orig 2021-02-18 02:59:34.000000000 -0700 -+++ src/abstractgraph.hh 2021-10-03 11:45:07.075286913 -0600 +--- include/bliss/abstractgraph.hh.orig 2022-06-17 07:24:11.000000000 -0600 ++++ include/bliss/abstractgraph.hh 2023-02-01 09:32:06.289384074 -0700 @@ -493,10 +493,14 @@ protected: */ unsigned int cr_component_elements; @@ -27,9 +17,19 @@ }; ---- src/graph.cc.orig 2021-02-18 02:59:34.000000000 -0700 -+++ src/graph.cc 2021-10-03 11:36:13.393644284 -0600 -@@ -1550,7 +1550,7 @@ Graph::nucr_find_first_component(const u +--- src/abstractgraph.cc.orig 2022-06-17 07:24:11.000000000 -0600 ++++ src/abstractgraph.cc 2023-02-01 09:31:50.377694086 -0700 +@@ -745,7 +745,6 @@ AbstractGraph::search(const bool canonic + initialize_certificate(); + + std::vector search_stack; +- std::vector first_path_info; + std::vector best_path_info; + + search_stack.clear(); +--- src/graph.cc.orig 2022-06-17 07:24:11.000000000 -0600 ++++ src/graph.cc 2023-02-01 09:32:06.290384054 -0700 +@@ -1551,7 +1551,7 @@ Graph::nucr_find_first_component(const u component.clear(); component_elements = 0; sh_return = 0; diff --git a/bliss.spec b/bliss.spec index 7c67d96..ec47d02 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,11 +1,12 @@ Name: bliss Version: 0.77 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only URL: https://users.aalto.fi/~tjunttil/bliss/ -Source0: %{url}/downloads/%{name}-%{version}.zip +VCS: https://github.com/ds4dm/Bliss +Source0: %{vcs}/archive/v%{version}/Bliss-%{version}.tar.gz # Man page written by Jerry James using text borrowed from the sources. # The man page therefore has the same copyright and license as the sources. Source1: bliss.1 @@ -13,6 +14,9 @@ Source1: bliss.1 # performance enhancement. Patch0: bliss-rehn.patch +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ @@ -70,14 +74,22 @@ A command-line bliss tool to access the functionality of the bliss library. %prep -%autosetup -p0 +%autosetup -n Bliss-%{version} -p0 # Do not override Fedora build flags. The last sagemath version added an -# soname. Duplicate it for compatibility. Link with GMP. +# soname. Duplicate it for compatibility. Link the library with libgmp. +# Hidden symbols hide ALL symbols, meaning we can't use the library. sed -e 's/ -O3//' \ - -e '/POSITION_INDEPENDENT/aset_target_properties(bliss PROPERTIES VERSION 2.0.0 SOVERSION 2)\ntarget_link_libraries(bliss gmp)' \ + -e '/POSITION_INDEPENDENT/a\ \ VERSION 2.0.0 SOVERSION 2' \ + -e '/^install($/itarget_link_libraries(libbliss ${GMP_LIBRARIES})' \ + -e '/VISIBILITY/d' \ -i CMakeLists.txt +# Fix installation directories +if [ "%{_lib}" != "lib" ]; then + sed -i 's,\(DESTINATION \)lib,\1%{_lib},' CMakeLists.txt +fi + %build %cmake -DUSE_GMP:BOOL=ON %cmake_build @@ -86,23 +98,7 @@ sed -e 's/ -O3//' \ doxygen %install -# %%cmake_install does nothing, so install manually - -# Install the binary -cd %{_vpath_builddir} -mkdir -p %{buildroot}%{_bindir} -install -m 0755 -p bliss %{buildroot}%{_bindir} - -# Install the library -mkdir -p %{buildroot}%{_libdir} -install -m 0755 -p libbliss.so.2.0.0 %{buildroot}%{_libdir} -ln -s libbliss.so.2.0.0 %{buildroot}%{_libdir}/libbliss.so.2 -ln -s libbliss.so.2 %{buildroot}%{_libdir}/libbliss.so -cd .. - -# Install the header files -mkdir -p %{buildroot}%{_includedir}/%{name} -install -m 0644 -p src/*.hh %{buildroot}%{_includedir}/%{name} +%cmake_install # Install the man page mkdir -p %{buildroot}%{_mandir}/man1 @@ -117,12 +113,18 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %doc html %{_includedir}/bliss %{_libdir}/libbliss.so +%{_libdir}/cmake/Bliss/ %files libs +%doc CHANGES.txt %license COPYING COPYING.LESSER %{_libdir}/libbliss.so.2* %changelog +* Thu Feb 22 2024 Jerry James - 0.77-8 +- Build the SCIP fork +- Do not build for 32-bit x86 + * Tue Jan 23 2024 Fedora Release Engineering - 0.77-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 3dddec5..c2c1d11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bliss-0.77.zip) = d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17 +SHA512 (Bliss-0.77.tar.gz) = 27bd44695f2c1f3dfcb2f39f75fea3f61db29dfde4bef545bd14017830cd3d399b2e448ae7a703a5886bd433b22f6eddfaa99618c8714340d366d8e387ae6583 From eddbe1b09202a3cb8e9d4913a422fdd5bbf30e86 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Jul 2024 12:32:51 -0600 Subject: [PATCH 15/20] Minor spec file simplifications --- bliss.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bliss.spec b/bliss.spec index ec47d02..4412bf8 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,3 +1,5 @@ +%global giturl https://github.com/ds4dm/Bliss + Name: bliss Version: 0.77 Release: 8%{?dist} @@ -5,14 +7,14 @@ Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only URL: https://users.aalto.fi/~tjunttil/bliss/ -VCS: https://github.com/ds4dm/Bliss -Source0: %{vcs}/archive/v%{version}/Bliss-%{version}.tar.gz +VCS: git:%{giturl}.git +Source0: %{giturl}/archive/v%{version}/Bliss-%{version}.tar.gz # Man page written by Jerry James using text borrowed from the sources. # The man page therefore has the same copyright and license as the sources. Source1: bliss.1 # Patch from Thomas Rehn, sent upstream 28 Oct 2011. Fix one bug and add one # performance enhancement. -Patch0: bliss-rehn.patch +Patch: bliss-rehn.patch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From b28f4e9be38f6d7e249c0764a7178d9682aab837 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:23:34 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index 4412bf8..c9d63cb 100644 --- a/bliss.spec +++ b/bliss.spec @@ -2,7 +2,7 @@ Name: bliss Version: 0.77 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -123,6 +123,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.77-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 22 2024 Jerry James - 0.77-8 - Build the SCIP fork - Do not build for 32-bit x86 From 3f184f2082b4f373affb8cb45a3f596b03baf8b6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 13 Jan 2025 13:33:07 -0700 Subject: [PATCH 17/20] Move configuration steps to %conf --- bliss.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/bliss.spec b/bliss.spec index c9d63cb..f9d2c28 100644 --- a/bliss.spec +++ b/bliss.spec @@ -78,6 +78,7 @@ library. %prep %autosetup -n Bliss-%{version} -p0 +%conf # Do not override Fedora build flags. The last sagemath version added an # soname. Duplicate it for compatibility. Link the library with libgmp. # Hidden symbols hide ALL symbols, meaning we can't use the library. From 01271737bd2e95812e960a5cad7448100951550e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:37:04 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index f9d2c28..1ff7113 100644 --- a/bliss.spec +++ b/bliss.spec @@ -2,7 +2,7 @@ Name: bliss Version: 0.77 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -124,6 +124,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.77-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 0.77-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3fe9a69c07779bae805ad28f0a1d2e21e6747263 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:45:17 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- bliss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bliss.spec b/bliss.spec index 1ff7113..d9c999d 100644 --- a/bliss.spec +++ b/bliss.spec @@ -2,7 +2,7 @@ Name: bliss Version: 0.77 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs License: LGPL-3.0-only @@ -124,6 +124,9 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %{_libdir}/libbliss.so.2* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.77-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.77-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 904970fbfacb2c0027b9ed60040df31a80ad3738 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 9 Jan 2026 21:35:00 -0700 Subject: [PATCH 20/20] Reflow the description text - More precise globbing in %files - Update the project URL --- bliss.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/bliss.spec b/bliss.spec index d9c999d..9b1aacd 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,4 +1,4 @@ -%global giturl https://github.com/ds4dm/Bliss +%global giturl https://github.com/scipopt/Bliss Name: bliss Version: 0.77 @@ -28,9 +28,9 @@ BuildRequires: make Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description -Bliss is an open source tool for computing automorphism groups and -canonical forms of graphs. It has both a command line user interface as -well as C++ and C programming language APIs. +Bliss is an open source tool for computing automorphism groups and canonical +forms of graphs. It has both a command line user interface as well as C++ and +C programming language APIs. %package devel # The content is LGPL-3.0-only. Other licenses are due to files installed by @@ -65,15 +65,14 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} %description devel -Headers and library files needed to develop applications that use the -bliss library. +Headers and library files needed to develop applications that use the bliss +library. %package libs Summary: Compute automorphism groups and canonical labelings of graphs %description libs -A command-line bliss tool to access the functionality of the bliss -library. +A command-line bliss tool to access the functionality of the bliss library. %prep %autosetup -n Bliss-%{version} -p0 @@ -121,7 +120,7 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1 %files libs %doc CHANGES.txt %license COPYING COPYING.LESSER -%{_libdir}/libbliss.so.2* +%{_libdir}/libbliss.so.2{,.*} %changelog * Wed Jul 23 2025 Fedora Release Engineering - 0.77-11