diff --git a/gap-4.10.0-core.zip b/gap-4.10.0-core.zip deleted file mode 100644 index e9f8250..0000000 --- a/gap-4.10.0-core.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f5681affa222c3d274ea8caa0c2df137060781f6a1bf651cd3400af6529668c -size 18553305 diff --git a/gap-4.12.0-core.tar.gz b/gap-4.12.0-core.tar.gz new file mode 100644 index 0000000..afec677 --- /dev/null +++ b/gap-4.12.0-core.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:529b47e95724cfe57728acc982053cc911eb2217b42df716516e45a119520806 +size 37612283 diff --git a/gap-rpmlintrc b/gap-rpmlintrc index b4f205a..0b6263f 100644 --- a/gap-rpmlintrc +++ b/gap-rpmlintrc @@ -1,2 +1,3 @@ -addFilter("devel-file-in-non-devel-package") +# Includes arch specific directories +addFilter("gap-rpm-devel.*no-binary") diff --git a/gap.changes b/gap.changes index 381ab38..128eff4 100644 --- a/gap.changes +++ b/gap.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Oct 2 14:56:32 UTC 2022 - Stefan BrĂ¼ns + +- Update to new upstream release 4.12.0 + * Added the missing perfect groups of order up to two million + * Initial support for make install available + * For details, see + https://github.com/gap-system/gap/blob/stable-4.12/CHANGES.md +- Update to new upstream release 4.11.0 + * Removed ability to return objects from many error break loops + * GAP now contains some C++ code + * HPC-GAP: The ward tool has been decommissioned + * Syntax trees: Functions were added which allow converting a + GAP function object into an abstract syntax tree which can + be parsed and modified from within GAP code +- Clean up spec file + ------------------------------------------------------------------- Wed Nov 14 20:11:37 UTC 2018 - Jan Engelhardt diff --git a/gap.spec b/gap.spec index 2474474..ae90b5e 100644 --- a/gap.spec +++ b/gap.spec @@ -1,7 +1,7 @@ # # spec file for package gap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: gap -Version: 4.10.0 +Version: 4.12.0 Release: 0 Summary: System for Computational Discrete Algebra License: GPL-2.0-or-later Group: Productivity/Scientific/Math -Url: http://gap-system.org/ +URL: https://gap-system.org/ -Source: https://www.gap-system.org/pub/gap/gap4core/gap-%version-core.zip +Source: https://github.com/gap-system/gap/releases/download/v%{version}/gap-%{version}-core.tar.gz Source2: macros.gap Source3: %name-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gcc-c++ %if 0%{?suse_version} BuildRequires: fdupes %endif @@ -42,7 +42,7 @@ Obsoletes: gap-data < %version Provides: gap-data = %version Requires: gap-gapdoc >= 1.5.1 -%define lname libgap0 +%define lname libgap8 %global gap_sitearch %_libdir/gap/pkg %global gap_sitelib %_datadir/gap/pkg @@ -261,48 +261,20 @@ This subpackage will pull in all optional packages of the GAP distribution. %build %configure -make %{?_smp_mflags} V=1 +%make_build %install -b="%buildroot" -%make_install +# Can not use "install" target, as that includes the "install-doc" target +%{__make} DESTDIR=%{?buildroot} INSTALL="%{__install} -p" \ + install-bin install-gaproot install-sysinfo install-headers install-libgap + +# Fixup rm -fv "%buildroot/%_libdir"/*.la - -# Fixup incomplete installation -mkdir -p "$b/%_datadir/gap" -cp -a grp lib "$b/%_datadir/gap/" - -mkdir -p "$b/%_libexecdir/%name" \ - "$b/%gap_sitearch" "$b/%gap_sitelib" -mv "$b/%_bindir/gap" "$b/%_libexecdir/%name/gap.bin" -cat >>"$b/%_bindir/gap" <<-EOF - #!/bin/sh - exec %_libexecdir/%name/gap.bin -l "%gap_sitearch/.." -l "%gap_sitelib/.." "\$@" -EOF -chmod a+x "$b/%_bindir/gap" - -namei sysinfo.gap -. ./sysinfo.gap -cat >"$b/%_libdir/gap/sysinfo.gap" <<-EOF - GAParch=$GAParch - GAP_ABI=$GAP_ABI - GAP_BIN_DIR="%_bindir" - GAP_LIB_DIR="%_libdir/gap" - GAP_CC="$GAP_CC" - GAP_CFLAGS="%optflags" - GAP_CPPFLAGS="-I%_includedir/gap" - GAP_LIBS="-lgap" - GAP_OBJS="" -EOF -ln -s . "$b/%_includedir/gap/src" -ln -s sysinfo.gap "$b/%_libdir/gap/sysinfo.gap-default$GAP_ABI" -mkdir -pv "$b/%gap_sitearch/../bin/$GAParch" -ln -s "%_bindir/gac" "$b/%gap_sitearch/../bin/$GAParch/" +chmod +x %{buildroot}/%{_datadir}/gap/etc/convert.pl # openSUSE-specific extras for RPMs -mkdir -p "$b/%_prefix/lib/rpm/macros.d" -cp "%_sourcedir/macros.gap" "$b/%_prefix/lib/rpm/macros.d/" -cat >>"$b/%_prefix/lib/rpm/macros.d/macros.gapdirs" <<-EOF +install -D -m 0644 -t "%{buildroot}/%_prefix/lib/rpm/macros.d/" "%_sourcedir/macros.gap" +cat >> "%{buildroot}/%_prefix/lib/rpm/macros.d/macros.gapdirs" <<-EOF # Directory for modules extending the core %%gap_sitelib %gap_sitelib %%gap_sitearch %gap_sitearch @@ -319,20 +291,18 @@ EOF %files %_bindir/gap* -%dir %_libexecdir/%name/ -%_libexecdir/%name/gap.bin %dir %_libdir/gap/ +%_libdir/gap/gap %_datadir/gap/ %files -n %lname -%_libdir/libgap.so.0* +%_libdir/libgap.so.8* %files devel %_bindir/gac* %_includedir/gap/ %_libdir/libgap.so %dir %_libdir/gap -%_libdir/gap/bin/ %_libdir/gap/sysinfo.gap* %files rpm-devel