Notification time stamped 2020-08-31 19:38:05 UTC
From 00bb56a96b45ee6a28a102b2e4a716e0de942f1e Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Aug 31 2020 19:37:44 +0000
Subject: Version 1.3.1.
- Add -autoconf patch.
- Add BR on eigen3.
- Do not ship the fmt headers in -devel.
---
diff --git a/libsemigroups-autoconf.patch b/libsemigroups-autoconf.patch
new file mode 100644
index 0000000..a03047b
--- /dev/null
+++ b/libsemigroups-autoconf.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index 1ef51d6..1aa1a7d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,6 +23,7 @@
AX_PREFIX_CONFIG_H([include/libsemigroups/libsemigroups-config.hpp],[],[config/c
+ AC_PROG_CXX
+ AC_LANG([C++])
+ AX_CXX_COMPILE_STDCXX_11(,[mandatory])
++AC_LANG_PUSH([C])
+
+ dnl ## Check for pthread, this seems to be required to compile with GCC
+ AX_PTHREAD(,[AC_MSG_ERROR([pthread is required])])
+@@ -53,6 +54,7 @@ AC_CHECK_SIZEOF([void *])
+ # Checks for library functions.
+ AC_FUNC_MALLOC
+ AC_CHECK_FUNCS([gettimeofday memset pow sqrt])
++AC_LANG_POP([C])
+
+ # Check if debug mode is enabled
+ AC_ARG_ENABLE([debug],
+diff --git a/m4/ax_check_eigen.m4 b/m4/ax_check_eigen.m4
+index c28fb90..54daafa 100644
+--- a/m4/ax_check_eigen.m4
++++ b/m4/ax_check_eigen.m4
+@@ -27,7 +27,8 @@ AC_DEFUN([AX_CHECK_EIGEN], [
+ if test "$with_external_eigen" = yes; then
+ m4_ifdef([PKG_CHECK_MODULES], [
+ PKG_CHECK_MODULES([EIGEN3],
+- [eigen3 >= $REQUI_EIGEN_VERSION])],
++ [eigen3 >= $REQUI_EIGEN_VERSION],
++ [eigen_enabled=yes])],
+ [AC_MSG_ERROR([cannot use flag --with-external-eigen, the libsemigroups
configure file was created on a system without m4 macros for pkg-config available...])])
+ else
+ AC_CHECK_FILE(
diff --git a/libsemigroups.spec b/libsemigroups.spec
index b1b6aa1..227b77e 100644
--- a/libsemigroups.spec
+++ b/libsemigroups.spec
@@ -1,11 +1,14 @@
Name: libsemigroups
-Version: 1.2.1
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: C++ library for semigroups and monoids
License: GPLv3+
URL:
https://github.com/libsemigroups/libsemigroups
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Fix bugs in the configure code
+# See
https://github.com/libsemigroups/libsemigroups/pull/237
+Patch0: %{name}-autoconf.patch
BuildRequires: doxygen
BuildRequires: fontawesome-fonts-web
@@ -15,6 +18,7 @@ BuildRequires: font(robotoslab)
BuildRequires: fontconfig
BuildRequires: gcc-c++
BuildRequires: libtool
+BuildRequires: pkgconfig(eigen3)
BuildRequires: pkgconfig(fmt)
BuildRequires: python3dist(beautifulsoup4)
BuildRequires: python3dist(breathe)
@@ -98,6 +102,9 @@ Documentation for %{name}.
%prep
%autosetup -p1
+# Regenerate configure due to patch0
+autoreconf -fi .
+
%build
# Hpcombi is an x86-specific library that uses SSE and AVX instructions.
# It is not currently available in Fedora, and we cannot assume the
@@ -105,7 +112,7 @@ Documentation for %{name}.
export CFLAGS="%{optflags} -fwrapv"
export CXXFLAGS="$CFLAGS"
%configure --disable-silent-rules --disable-static --disable-hpcombi \
- --with-external-fmt
+ --enable-eigen --with-external-eigen --enable-fmt --with-external-fmt
# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
# -Wl,--as-needed after all the libraries.
@@ -138,6 +145,14 @@ cd -
%make_install
rm -f %{buildroot}%{_libdir}/*.la
+# Do not bundle the fmt headers
+rm -fr %{buildroot}%{_includedir}/libsemigroups/fmt
+sed -i.orig 's,"\(fmt/[[:alnum:]]*\.h\)",<\1>,g' \
+ %{buildroot}%{_includedir}/libsemigroups/report.hpp
+touch -r %{buildroot}%{_includedir}/libsemigroups/report.hpp.orig \
+ %{buildroot}%{_includedir}/libsemigroups/report.hpp
+rm %{buildroot}%{_includedir}/libsemigroups/report.hpp.orig
+
%check
LD_LIBRARY_PATH=$PWD/.libs make check
@@ -157,6 +172,12 @@ LD_LIBRARY_PATH=$PWD/.libs make check
%license LICENSE
%changelog
+* Mon Aug 31 2020 Jerry James <loganjerry(a)gmail.com> - 1.3.1-1
+- Version 1.3.1
+- Add -autoconf patch
+- Add BR on eigen3
+- Do not ship the fmt headers in -devel
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 130eac7..a0323b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libsemigroups-1.2.1.tar.gz) =
2a571064bbf0b6d2f6315bbb0414437b4fdc2cde1f489f7bb0f197aa1ade0db458a72eda69607d955302ba99fbc4342357510eb51a519f53b12707d4f689cb96
+SHA512 (libsemigroups-1.3.1.tar.gz) =
edb7b38716fe51a6d966c4a69942ff46ed19afdd9196776a14f0194e1c4cc1dc05b4c0aed581d9147310ff8a3a47d76d0802533bb7c73db2a36d93267926157a
https://src.fedoraproject.org/rpms/libsemigroups/c/00bb56a96b45ee6a28a102...