diff --git a/bliss-rehn.patch b/bliss-rehn.patch index 8879561..b2ebf09 100644 --- a/bliss-rehn.patch +++ b/bliss-rehn.patch @@ -1,5 +1,15 @@ ---- 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 +--- 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 @@ -493,10 +493,14 @@ protected: */ unsigned int cr_component_elements; @@ -17,19 +27,9 @@ }; ---- 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 +--- 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; diff --git a/bliss.spec b/bliss.spec index 9b1aacd..f9a9e77 100644 --- a/bliss.spec +++ b/bliss.spec @@ -1,23 +1,17 @@ -%global giturl https://github.com/scipopt/Bliss - Name: bliss Version: 0.77 -Release: 11%{?dist} +Release: 1%{?dist} Summary: Compute automorphism groups and canonical labelings of graphs -License: LGPL-3.0-only +License: LGPLv3 URL: https://users.aalto.fi/~tjunttil/bliss/ -VCS: git:%{giturl}.git -Source0: %{giturl}/archive/v%{version}/Bliss-%{version}.tar.gz +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 # Patch from Thomas Rehn, sent upstream 28 Oct 2011. Fix one bug and add one # performance enhancement. -Patch: bliss-rehn.patch - -# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} +Patch0: bliss-rehn.patch BuildRequires: cmake BuildRequires: doxygen @@ -28,79 +22,60 @@ 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 -# 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} %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 +%autosetup -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. +# soname. Duplicate it for compatibility. Link with GMP. sed -e 's/ -O3//' \ - -e '/POSITION_INDEPENDENT/a\ \ VERSION 2.0.0 SOVERSION 2' \ - -e '/^install($/itarget_link_libraries(libbliss ${GMP_LIBRARIES})' \ - -e '/VISIBILITY/d' \ + -e '/POSITION_INDEPENDENT/aset_target_properties(bliss PROPERTIES VERSION 2.0.0 SOVERSION 2)\ntarget_link_libraries(bliss gmp)' \ -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 -DUSE_GMP:BOOL=ON . %cmake_build # Build the documentation doxygen %install -%cmake_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} # Install the man page mkdir -p %{buildroot}%{_mandir}/man1 @@ -115,48 +90,12 @@ 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{,.*} +%{_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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 diff --git a/sources b/sources index c2c1d11..3dddec5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Bliss-0.77.tar.gz) = 27bd44695f2c1f3dfcb2f39f75fea3f61db29dfde4bef545bd14017830cd3d399b2e448ae7a703a5886bd433b22f6eddfaa99618c8714340d366d8e387ae6583 +SHA512 (bliss-0.77.zip) = d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17