The package rpms/gap-pkg-ctbllib.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gap-pkg-ctbllib.git/commit/?id=4f....
Change:
+ExclusiveArch: %{gap_arches} noarch
Thanks.
Full change:
============
commit bf5f4d8d85e9a72cb76aa8c483522c58b3284dcc
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Mar 7 10:56:36 2023 -0700
Version 1.3.5.
diff --git a/gap-pkg-ctbllib-makedocrel.patch b/gap-pkg-ctbllib-makedocrel.patch
new file mode 100644
index 0000000..33e1aab
--- /dev/null
+++ b/gap-pkg-ctbllib-makedocrel.patch
@@ -0,0 +1,23 @@
+--- ctbllib-1.3.5/makedocrel.g.orig 2023-02-28 08:24:52.000000000 -0700
++++ ctbllib-1.3.5/makedocrel.g 2023-03-07 10:33:55.031613802 -0700
+@@ -52,13 +52,17 @@ GAPDoc2HTMLProcs.AdjustExtURL := functio
+ if IsBound( GAPDoc2HTMLProcs.RelPath ) then
+ # We want to replace absolute paths in links to other package manuals
+ # by relative links.
+- pkgpath:= Concatenation( GAPInfo.MainRootPath, "pkg/" );
+- if not StartsWith( res, pkgpath ) then
++ for x in GAPInfo.RootPaths do
++ if StartsWith(res, Concatenation( x, "pkg/" )) then
++ pkgpath := Concatenation( x, "pkg/" );
++ fi;
++ od;
++ if not IsBound(pkgpath) then
+ # Perhaps the link points to a package outside the main root path.
+ # Probably this indicates an error.
+ if ForAny( RecNames( GAPInfo.PackagesLoaded ),
+ x -> StartsWith( res, GAPInfo.PackagesLoaded.( x )[1] ) ) then
+- Error( "<url> points to a package outside the main GAP root
path" );
++ Error( "<url> points to a package outside the main GAP root path:
", res );
+ fi;
+ # Otherwise the link is just kept.
+ # Typical examples are links to the GAP Manuals,
diff --git a/gap-pkg-ctbllib.spec b/gap-pkg-ctbllib.spec
index 438a351..7fb585d 100644
--- a/gap-pkg-ctbllib.spec
+++ b/gap-pkg-ctbllib.spec
@@ -9,8 +9,8 @@
%bcond_with bootstrap
Name: gap-pkg-%{pkgname}
-Version: 1.3.4
-Release: 5%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
Summary: GAP Character Table Library
License: GPL-3.0-or-later
@@ -21,6 +21,10 @@ Source0: %{url}%{pkgname}-%{version}.tar.gz
# Predownloaded data from ATLAS needed for the tests
Source1: %{name}-testdata.tar.xz
+# The makedocrel script determines that the package being built is outside of
+# the normal GAP install directories and refuses to do anything with it.
+Patch0: %{name}-makedocrel.patch
+
BuildRequires: gap-devel
BuildRequires: GAPDoc-latex
BuildRequires: gap-pkg-atlasrep-doc
@@ -70,23 +74,22 @@ Requires: gap-pkg-tomlib-doc
This package contains documentation for gap-pkg-%{pkgname}.
%prep
-%autosetup -n %{pkgname}-%{version} -b 1
+%autosetup -n %{pkgname}-%{version} -b1 -p1
# Remove spurious executable bit
chmod a-x doc/utils.xml
%build
export LC_ALL=C.UTF-8
+gap < makedocrel.g
-# Link to main GAP documentation
-cp -a %{gap_libdir}/doc ../../doc
-ln -s %{gap_libdir}/pkg/smallgrp ..
-mkdir -p ../pkg
-ln -s ../%{pkgname}-%{version} ../pkg
-gap -l "$PWD/..;" < makedocrel.g
# The ctbltoc material requires a GAP package named "genus" to build. We do
-# not have that package in Fedora, and I can find no trace of it online. If
-# we do manage to locate and package it, uncomment the following:
+# not have that package in Fedora. It appears to be for older versions of GAP.
+# See:
+#
https://www.math.rwth-aachen.de/~Thomas.Breuer/genus/genus.html
+#
http://www.math.rwth-aachen.de/~Greg.Gamble/gap4r3/pkg/genus/doc/manual.pdf
+# If a version that works with modern GAP versions is located, uncomment the
+# following:
# mkdir -p ctbltoc/data ctbltoc/views
# gap -l "$PWD/..;" << EOF
# ReadPackage( "ctbllib", "ctbltoc/init.g" );
@@ -97,11 +100,6 @@ gap -l "$PWD/..;" < makedocrel.g
# HTMLCreateView.( name )();
# od;
# EOF
-rm -fr ../smallgrp ../../doc ../pkg
-
-# Remove the build directory from the documentation
-sed -i "s,$PWD/doc/\.\./\.\./pkg,../..,g" doc/*.html
-sed -i "s,$PWD/doc2/\.\./\.\./pkg,../..,g" doc2/*.html
# Compress large tables
parallel %{?_smp_mflags} --no-notice gzip --best ::: data/*.tbl
@@ -131,14 +129,11 @@ EOF
# Do not run testall.g. It takes several days to run.
mkdir -p ../pkg
ln -s ../%{pkgname}-%{version} ../pkg
-sed -i '/BrowseCTblLibInfo();/d' gap4/ctbltocb.g tst/docxpl.tst{,~}
+sed -i '/BrowseCTblLibInfo();/d' gap4/ctbltocb.g tst/docxpl.tst
gap -l "$PWD/..;" tst/testauto.g
rm -fr ../pkg
%endif
-# Cleanup
-rm %{buildroot}%{gap_libdir}/pkg/%{pkgname}/tst/*~
-
%files
%doc README.md
%{gap_libdir}/pkg/%{pkgname}/
@@ -155,6 +150,9 @@ rm %{buildroot}%{gap_libdir}/pkg/%{pkgname}/tst/*~
%{gap_libdir}/pkg/%{pkgname}/htm/
%changelog
+* Tue Mar 7 2023 Jerry James <loganjerry(a)gmail.com> - 1.3.5-1
+- Version 1.3.5
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.4-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 336be17..1837f6e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ctbllib-1.3.4.tar.gz) =
8960b847ef0b3b98240ffcf1557d0b3d4359de6bcd4bcb5453e46a0b6dd56f9cf8d1a8da43e0c48faf2997579236ed03daddba2840c86199027625082e28f3e7
+SHA512 (ctbllib-1.3.5.tar.gz) =
e270e584d5d9888b419378137ec6ef1995510fc2b82261995955c6ef645380f1a16363c05ff0b18ff9c7f17e56a1f748988a197efb5045ce06ad5d5270aaf97b
SHA512 (gap-pkg-ctbllib-testdata.tar.xz) =
52a3bac620e9a9904ea309ffd083862ad1c654d2ae5bf0a387421f5cc26f5c42c31c85ca746514e31a429c18cb968b7c170b159c4abec30ec86352e828b90115
commit 4fd9a8ed3a761e53fc2c3bc2533c95b3839d8e8a
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Feb 14 13:57:12 2023 -0700
Use the %gap_arches macro.
Verified that License tag is valid SPDX.
diff --git a/gap-pkg-ctbllib.spec b/gap-pkg-ctbllib.spec
index d071179..438a351 100644
--- a/gap-pkg-ctbllib.spec
+++ b/gap-pkg-ctbllib.spec
@@ -15,7 +15,7 @@ Summary: GAP Character Table Library
License: GPL-3.0-or-later
BuildArch: noarch
-ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch
+ExclusiveArch: %{gap_arches} noarch
URL:
https://www.math.rwth-aachen.de/~Thomas.Breuer/ctbllib/
Source0: %{url}%{pkgname}-%{version}.tar.gz
# Predownloaded data from ATLAS needed for the tests