From c6d13161164fa84806193f0cc2631aaf9f73d1a8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: May 29 2020 16:46:09 +0000 Subject: Incorporate upstream changes and cleanups. Drop the libgap-devel subpackage; it is not useful. --- diff --git a/gap-README.fedora b/gap-README.fedora index 6cf86d5..391ebed 100644 --- a/gap-README.fedora +++ b/gap-README.fedora @@ -2,12 +2,12 @@ Based on "GAP for Debian" by Bill Allombert -GAP (http://www.gap-system.org) is a system for computational discrete +GAP (https://www.gap-system.org) is a system for computational discrete algebra. Many add-on components ("packages") are available for GAP, most of them not yet available from Fedora. However, they can be installed locally in any of the following locations: - - /usr/local/share/gap/pkg - - /usr/local/lib/gap/pkg + - /usr/share/gap/pkg + - /usr/lib/gap/pkg - ~/gap/pkg Some packages must be compiled. The necessary tools are available in the diff --git a/gap-escape.patch b/gap-escape.patch deleted file mode 100644 index 1011aee..0000000 --- a/gap-escape.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- doc/manualindex.orig 2018-11-01 16:56:12.000000000 -0600 -+++ doc/manualindex 2019-01-24 15:29:17.825867480 -0700 -@@ -9,31 +9,31 @@ makeindex -l $1.idl - - # put hyphenation help into long commands - echo "Hyphenating long index entries" --echo '{a=index($0,"`");\ -- if (a==0) {print $0;}\ -- else {\ -- b=index($0,"'"'"'");\ -- if (b-a>40) {\ -- anf=substr($0,1,a);\ -- mid=substr($0,a+1,b-a-1);\ -- end=substr($0,b);\ -- b=length(mid);\ -- i=1;\ -- cap=1;\ -- mid2=substr(mid,1,i-1);\ -- while (i<=length(mid)) {\ -- c=substr(mid,i,1);\ -- if (c!=tolower(c)){\ -- if (cap==0) mid2 = mid2 "\\\-";\ -- cap=1;\ -- }\ -- else cap=0;\ -- mid2=mid2 c;\ -- i=i+1;\ -- }\ -- print anf mid2 end;\ -- }\ -- else print $0;\ -+echo '{a=index($0,"`"); -+ if (a==0) {print $0;} -+ else { -+ b=index($0,"'"'"'"); -+ if (b-a>40) { -+ anf=substr($0,1,a); -+ mid=substr($0,a+1,b-a-1); -+ end=substr($0,b); -+ b=length(mid); -+ i=1; -+ cap=1; -+ mid2=substr(mid,1,i-1); -+ while (i<=length(mid)) { -+ c=substr(mid,i,1); -+ if (c!=tolower(c)){ -+ if (cap==0) mid2 = mid2 "\\-"; -+ cap=1; -+ } -+ else cap=0; -+ mid2=mid2 c; -+ i=i+1; -+ } -+ print anf mid2 end; -+ } -+ else print $0; - } - }' >mh.awk - cp $1.ind $1.idl diff --git a/gap.appdata.xml b/gap.appdata.xml index 3e8ec80..c6dee62 100644 --- a/gap.appdata.xml +++ b/gap.appdata.xml @@ -26,6 +26,6 @@ loganjerry@gmail.com GAP Centers - http://www.gap-system.org/ - http://www.gap-system.org/Contacts/trouble.html + https://www.gap-system.org/ + https://github.com/gap-system/gap/issues/ diff --git a/gap.spec b/gap.spec index d891c89..b2c9bff 100644 --- a/gap.spec +++ b/gap.spec @@ -31,14 +31,14 @@ Name: gap Version: 4.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Computational discrete algebra %global majver %(cut -d. -f1-2 <<< %{version}) License: GPLv2+ -URL: http://www.gap-system.org/ -Source0: https://www.gap-system.org/pub/gap/gap-%{majver}/tar.bz2/%{name}-%{version}.tar.bz2 +URL: https://www.gap-system.org/ +Source0: https://files.gap-system.org/gap-%{majver}/tar.bz2/%{name}-%{version}.tar.bz2 Source1: gap-README.fedora Source2: update-gap-workspace Source3: gap.xml @@ -53,14 +53,12 @@ Patch0: %{name}-bootstrap.patch # This patch applies a change from Debian to allow help files to be in gzip # compressed DVI files, and also adds support for viewing with xdg-open. Patch1: %{name}-help.patch -# Fix escapes in manualindex -Patch2: %{name}-escape.patch # Fix broken references in the reference manual's lab file -Patch3: %{name}-ref.patch +Patch2: %{name}-ref.patch # Fix paths in gac -Patch4: %{name}-gac.patch +Patch3: %{name}-gac.patch # Work around a problem with inlining that currently manifests only on aarch64 -Patch5: %{name}-aarch64.patch +Patch4: %{name}-aarch64.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -155,6 +153,12 @@ BuildArch: noarch This package provides VIM add-on files to support editing GAP sources. Both syntax highlighting and indentation are supported. +# We used to have a separate libgap-devel package. That has been removed +# because: +# - it only contained libgap.so; +# - sagemath, the only consumer of libgap, requires libgap.so in addition to +# to the contents of the libgap package, so both had to be installed anyway + %package -n libgap Summary: Library containing core GAP logic Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -175,17 +179,13 @@ Requires: gap-pkg-resclasses Requires: gap-pkg-sophus Requires: gap-pkg-tomlib +# This can be removed when Fedora 35 reaches EOL +Obsoletes: libgap-devel < 4.11.0-4 +Provides: libgap-devel = %{version}-%{release} + %description -n libgap Library containing core GAP logic -%package -n libgap-devel -Summary: Headers and library links for libgap -Requires: gap-devel = %{version}-%{release} -Requires: libgap = %{version}-%{release} - -%description -n libgap-devel -Headers and library links for libgap. - %prep %autosetup -N %if %{with bootstrap} @@ -195,7 +195,6 @@ Headers and library links for libgap. %patch2 %patch3 %patch4 -%patch5 # Get the README cp -p %{SOURCE1} README.fedora @@ -214,11 +213,6 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ %make_build V=1 -# Prepare to build packages -sed -i "s|@gaparch@|%{gaparch}|" bin/%{gaparch}/gac -mkdir -p bin/%{gaparch}/extern/gmp/include -ln -s %{_includedir}/gmp.h bin/%{gaparch}/extern/gmp/include - # Rebuild the manuals from source export GAP_DIR=$PWD make manuals @@ -227,7 +221,7 @@ make manuals sed -i 's/ / /g;/Calling a function/N;s/\n/ /' doc/ref/manual.lab # Remove build paths -sed -i "s|$PWD|%{gapdir}|g" sysinfo.gap bin/gap.sh bin/%{gaparch}/gac doc/make_doc +sed -i "s|$PWD|%{gapdir}|g" sysinfo.gap bin/gap.sh gac doc/make_doc # Fix mangled paths in gap.sh sed -i "s|^\(GAP_EXE=\).*|\1%{_bindir}|;/ GAP_EXE=/d" bin/gap.sh @@ -302,7 +296,7 @@ popd # Make an empty directory to hold the GAP packages mkdir -p %{buildroot}%{gapdir}/pkg -# Intall the documentation +# Install the documentation cp -a doc %{buildroot}%{gapdir} rm -f %{buildroot}%{gapdir}/doc/*.in rm -f %{buildroot}%{gapdir}/doc/*/*.{aux,bbl,blg,brf,idx,ilg,ind,log,out,pnr} @@ -428,7 +422,6 @@ make check %{gapdir}/bin/BuildPackages.sh %{gapdir}/bin/%{gaparch}/gac %{gapdir}/bin/%{gaparch}/config.h -%{gapdir}/bin/%{gaparch}/extern/ %{gapdir}/bin/%{gaparch}/src %{gapdir}/etc/ %{gapdir}/gac @@ -448,11 +441,13 @@ make check %files -n libgap %{_libdir}/libgap.so.0 %{_libdir}/libgap.so.0.* - -%files -n libgap-devel %{_libdir}/libgap.so %changelog +* Fri May 29 2020 Jerry James - 4.11.0-4 +- Incorporate upstream changes and cleanups +- Drop the libgap-devel subpackage; it is not useful + * Thu Apr 2 2020 Jerry James - 4.11.0-3 - Reenable inlining on aarch64 on all but 1 function