Compare commits

...
Sign in to create a new pull request.

15 commits

Author SHA1 Message Date
Jerry James
904970fbfa Reflow the description text
- More precise globbing in %files
- Update the project URL
2026-01-09 21:35:00 -07:00
Fedora Release Engineering
3fe9a69c07 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:45:17 +00:00
Fedora Release Engineering
01271737bd Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 12:37:04 +00:00
Jerry James
3f184f2082 Move configuration steps to %conf 2025-01-13 13:33:07 -07:00
Fedora Release Engineering
b28f4e9be3 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 18:23:34 +00:00
Jerry James
eddbe1b092 Minor spec file simplifications 2024-07-16 12:32:51 -06:00
Jerry James
3a843bd252 Build the SCIP fork
- Do not build for 32-bit x86
2024-02-22 10:09:49 -07:00
Fedora Release Engineering
44dbaa0ac3 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-23 00:31:55 +00:00
Fedora Release Engineering
55be07512b Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 14:29:31 +00:00
Fedora Release Engineering
4de9c81283 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 14:42:59 +00:00
Fedora Release Engineering
d8bf91f114 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 22:58:18 +00:00
Jerry James
cd8680b6fe Clarify bliss-devel license. 2022-11-22 11:30:52 -07:00
Jerry James
066f0a2cb7 Convert License tag to SPDX. 2022-08-15 11:38:45 -06:00
Jerry James
547f37482f Remove dot from %cmake invocation to fix FTBFS. 2022-07-20 16:27:51 -06:00
Fedora Release Engineering
ee3e440473 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 22:04:07 +00:00
3 changed files with 107 additions and 49 deletions

View file

@ -1,15 +1,5 @@
--- src/abstractgraph.cc.orig 2021-02-18 02:59:34.000000000 -0700 --- include/bliss/abstractgraph.hh.orig 2022-06-17 07:24:11.000000000 -0600
+++ src/abstractgraph.cc 2021-10-03 11:35:51.011616678 -0600 +++ include/bliss/abstractgraph.hh 2023-02-01 09:32:06.289384074 -0700
@@ -745,7 +745,6 @@ AbstractGraph::search(const bool canonic
initialize_certificate();
std::vector<TreeNode> search_stack;
- std::vector<PathInfo> first_path_info;
std::vector<PathInfo> 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: @@ -493,10 +493,14 @@ protected:
*/ */
unsigned int cr_component_elements; unsigned int cr_component_elements;
@ -27,9 +17,19 @@
}; };
--- src/graph.cc.orig 2021-02-18 02:59:34.000000000 -0700 --- src/abstractgraph.cc.orig 2022-06-17 07:24:11.000000000 -0600
+++ src/graph.cc 2021-10-03 11:36:13.393644284 -0600 +++ src/abstractgraph.cc 2023-02-01 09:31:50.377694086 -0700
@@ -1550,7 +1550,7 @@ Graph::nucr_find_first_component(const u @@ -745,7 +745,6 @@ AbstractGraph::search(const bool canonic
initialize_certificate();
std::vector<TreeNode> search_stack;
- std::vector<PathInfo> first_path_info;
std::vector<PathInfo> 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.clear();
component_elements = 0; component_elements = 0;
sh_return = 0; sh_return = 0;

View file

@ -1,17 +1,23 @@
%global giturl https://github.com/scipopt/Bliss
Name: bliss Name: bliss
Version: 0.77 Version: 0.77
Release: 2%{?dist} Release: 11%{?dist}
Summary: Compute automorphism groups and canonical labelings of graphs Summary: Compute automorphism groups and canonical labelings of graphs
License: LGPLv3 License: LGPL-3.0-only
URL: https://users.aalto.fi/~tjunttil/bliss/ URL: https://users.aalto.fi/~tjunttil/bliss/
Source0: %{url}/downloads/%{name}-%{version}.zip 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. # 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. # The man page therefore has the same copyright and license as the sources.
Source1: bliss.1 Source1: bliss.1
# Patch from Thomas Rehn, sent upstream 28 Oct 2011. Fix one bug and add one # Patch from Thomas Rehn, sent upstream 28 Oct 2011. Fix one bug and add one
# performance enhancement. # performance enhancement.
Patch0: bliss-rehn.patch Patch: bliss-rehn.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
BuildRequires: cmake BuildRequires: cmake
BuildRequires: doxygen BuildRequires: doxygen
@ -22,60 +28,79 @@ BuildRequires: make
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description %description
Bliss is an open source tool for computing automorphism groups and Bliss is an open source tool for computing automorphism groups and canonical
canonical forms of graphs. It has both a command line user interface as forms of graphs. It has both a command line user interface as well as C++ and
well as C++ and C programming language APIs. C programming language APIs.
%package devel %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 Summary: Headers and library files for developing with bliss
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: gmp-devel%{?_isa} Requires: gmp-devel%{?_isa}
%description devel %description devel
Headers and library files needed to develop applications that use the Headers and library files needed to develop applications that use the bliss
bliss library. library.
%package libs %package libs
Summary: Compute automorphism groups and canonical labelings of graphs Summary: Compute automorphism groups and canonical labelings of graphs
%description libs %description libs
A command-line bliss tool to access the functionality of the bliss A command-line bliss tool to access the functionality of the bliss library.
library.
%prep %prep
%autosetup -p0 %autosetup -n Bliss-%{version} -p0
%conf
# Do not override Fedora build flags. The last sagemath version added an # 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//' \ 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 -i CMakeLists.txt
# Fix installation directories
if [ "%{_lib}" != "lib" ]; then
sed -i 's,\(DESTINATION \)lib,\1%{_lib},' CMakeLists.txt
fi
%build %build
%cmake -DUSE_GMP:BOOL=ON . %cmake -DUSE_GMP:BOOL=ON
%cmake_build %cmake_build
# Build the documentation # Build the documentation
doxygen doxygen
%install %install
# %%cmake_install does nothing, so install manually %cmake_install
# 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 # Install the man page
mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man1
@ -90,12 +115,45 @@ touch -r %{SOURCE1} %{buildroot}%{_mandir}/man1/bliss.1
%doc html %doc html
%{_includedir}/bliss %{_includedir}/bliss
%{_libdir}/libbliss.so %{_libdir}/libbliss.so
%{_libdir}/cmake/Bliss/
%files libs %files libs
%doc CHANGES.txt
%license COPYING COPYING.LESSER %license COPYING COPYING.LESSER
%{_libdir}/libbliss.so.2* %{_libdir}/libbliss.so.2{,.*}
%changelog %changelog
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Feb 22 2024 Jerry James <loganjerry@gmail.com> - 0.77-8
- Build the SCIP fork
- Do not build for 32-bit x86
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Aug 15 2022 Jerry James <loganjerry@gmail.com> - 0.77-3
- Convert License tag to SPDX
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-2 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (bliss-0.77.zip) = d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17 SHA512 (Bliss-0.77.tar.gz) = 27bd44695f2c1f3dfcb2f39f75fea3f61db29dfde4bef545bd14017830cd3d399b2e448ae7a703a5886bd433b22f6eddfaa99618c8714340d366d8e387ae6583