Accepting request 1249123 from science

- Make specfile conform to POSIX sh

OBS-URL: https://build.opensuse.org/request/show/1249123
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gap-semigroups?expand=0&rev=10

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1740697291
+commit: 2943f7111f312cacd4d3960cc51eba9d91c404e71dee86062d344d3c68eee4d8
+url: https://src.opensuse.org/jengelh/gap-semigroups
+revision: master

bundled-paths.patch

@@ -1,62 +0,0 @@
-From 6f2259f81b9de5ad14e4019cc31a03f6b09b61e8 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 21 Jul 2025 20:38:57 +0200
-Subject: [PATCH] build: override bundled libsemigroups install paths
-References: https://github.com/semigroups/Semigroups/pull/1074
-
----
- GNUmakefile.in | 11 ++++++++---
- configure.ac   |  4 ----
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index d55c7e4e..421d928c 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -1,6 +1,11 @@
- #
- # Makefile rules for the semigroups package
- #
-+abs_top_builddir = @abs_top_builddir@
-+top_builddir = @top_builddir@
-+abs_builddir = @abs_builddir@
-+builddir = @builddir@
-+
- KEXT_NAME = semigroups
- 
- KEXT_CXXFLAGS = @LIBSEMIGROUPS_CFLAGS@ -std=gnu++14 -O3
-@@ -84,13 +89,13 @@ $(KEXT_OBJS): bin/include/libsemigroups/libsemigroups.hpp
- 
- # the following is only run if BUILT_SOURCES is wound up
- bin/include/libsemigroups/libsemigroups.hpp:
--	$(MAKE) -C libsemigroups install
-+	$(MAKE) -C libsemigroups install prefix='${abs_builddir}/bin' includedir='${abs_builddir}/bin/include' libdir='${abs_builddir}/bin/lib'
- 	# Cygwin only looks for DLLs in the same directory as the executable
- 	# resides in. The following achieves that assuming that the GAP
- 	# being used was self-compiled by the user. This supports
- 	# both older GAPs with libtool (first) and GAP without libtool (second)
--	if test -f bin/bin/cygsemigroups*.dll ; then if test -d $(GAPPATH)/.libs; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/.libs/ ; fi ; fi
--	if test -f bin/bin/cygsemigroups*.dll ; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/ ; fi
-+	if test -f bin/lib/cygsemigroups*.dll ; then if test -d $(GAPPATH)/.libs; then cp bin/lib/cygsemigroups*.dll $(GAPPATH)/.libs/ ; fi ; fi
-+	if test -f bin/lib/cygsemigroups*.dll ; then cp bin/lib/cygsemigroups*.dll $(GAPPATH)/ ; fi
- 
- endif
- 
-diff --git a/configure.ac b/configure.ac
-index 80237dce..51cca67f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,10 +16,6 @@ AC_CONFIG_MACRO_DIR([m4])
- 
- AX_PREFIX_CONFIG_H([src/semigroups-config.hpp],[semigroups],[gen/pkgconfig.h])
- 
--dnl ## abs_top_builddir seems to hold the top build dir for the subpackage
--dnl ## libsemigroups which is why this contains ../
--AC_PREFIX_DEFAULT('${abs_top_builddir}/../bin/')
--
- dnl ##
- dnl ## Set the language
- dnl ##
--- 
-2.50.1
-

gap-semigroups.changes

@@ -1,17 +1,3 @@
--------------------------------------------------------------------
-Fri Jul 18 09:42:27 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 5.5.3
-  * Internal API rework: Replace custom type GVarFunc
-    with GAP's ObjFunc
-- Add bundled-paths.patch
-
--------------------------------------------------------------------
-Thu Jun 19 11:19:02 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 5.5.1
-  * Fix unspecified issue in TikzString
-
 -------------------------------------------------------------------
 Thu Feb 27 23:00:16 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
 

gap-semigroups.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gap-semigroups
-Version:        5.5.3
+Version:        5.5.0
 Release:        0
 Summary:        GAP: Computing with Semigroups of Transformations and Partial Permutations
 License:        GPL-2.0-or-later
@@ -26,21 +26,15 @@ URL:            https://semigroups.github.io/Semigroups/
 #Git-Clone:     https://github.com/semigroups/Semigroups
 Source:         https://github.com/semigroups/Semigroups/releases/download/v%version/semigroups-%version.tar.gz
 Patch1:         no-avx.patch
-Patch2:         bundled-paths.patch
 BuildRequires:  automake
 BuildRequires:  c++_compiler
-BuildRequires:  chrpath
 BuildRequires:  fdupes
 BuildRequires:  gap-devel >= 4.12.1
 BuildRequires:  gap-rpm-devel
 BuildRequires:  gmp-devel
-BuildRequires:  pkgconfig(eigen3)
-BuildRequires:  pkgconfig(fmt) >= 10.1
 BuildRequires:  libtool
 BuildRequires:  xz
-Provides:       bundled(libsemigroups) = 2.7.4
-Provides:       bundled(magic_enum)
-Provides:       bundled(rx-ranges)
+BuildRequires:  pkgconfig(libsemigroups)
 Requires:       gap-core >= 4.12.1
 Requires:       gap-datastructures >= 0.2.5
 Requires:       gap-digraphs >= 1.6.2
@@ -65,38 +59,16 @@ possible to test if a semigroup satisfies a particular property, such
 as if it is regular, simple, inverse, completely regular, and a
 variety of further properties.
 
-%package -n libsemigroups2
-Summary:        Library with algorithms for computing finite and finitely presented semigroups
-Group:          System/Libraries
-
-%description -n libsemigroups2
-A C++14 library containing implementations of several algorithms for
-computing finite and finitely presented semigroups.
-
 %prep
 %autosetup -n semigroups-%version
 
 %build
 autoreconf -fi
-# gap-semigroup use of a just-built bundled libsemigroups is fragile
-%set_build_flags
-export CFLAGS="$CFLAGS $(pkg-config eigen3 --cflags)"
-export CXXFLAGS="$CXXFLAGS $(pkg-config eigen3 --cflags)"
-# hpcombi requires AVX-256, which is not guaranteed to exist everywhere
-%configure --disable-static --disable-hpcombi \
-	--enable-eigen --with-external-eigen \
-	--enable-fmt --with-external-fmt \
-	--with-gaproot="%gapdir"
-
+%configure --with-gaproot="%gapdir" --with-external-libsemigroups
 %make_build
 
 %install
-b="%buildroot"
-mkdir -pv "$b/%_libdir"
-rm -Rfv libsemigroups bin/include bin/lib/*.la bin/lib/*.so bin/lib/pkgconfig
-mv -v bin/lib/* "$b/%_libdir/"
-
-find . -name semigroups.so -exec chrpath -d "{}" "+"
+rm -Rf libsemigroups
 %gappkg_simple_install
 cd "%buildroot/$fmoddir/"
 rm -Rfv Makefile* configure* config.* cnf/ src/ gapbind14/src/ gapbind14/include/ autom4te.cache
@@ -104,11 +76,6 @@ find "%buildroot" "(" -name "*.orig" -o -name .gitignore -o \
 	-name .dirstamp -o -name .clang-format -o -name .ccls ")" -print -delete
 %fdupes %buildroot/%_prefix
 
-%ldconfig_scriptlets -n libsemigroups2
-
 %files -f %name.files
 
-%files -n libsemigroups2
-%_libdir/libsemigroups.so.*
-
 %changelog