Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

- Use gap(...) symbols in dependencies

README.md

@@ -0,0 +1,4 @@
+# xgap
+
+[XGAP](https://gap-packages.github.io/xgap/) is an X Windows GUI for
+[GAP](https://www.gap-system.org/).

changelog

@@ -0,0 +1,161 @@
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.31-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Nov 30 2023 Jerry James <loganjerry@gmail.com> - 4.31-9
+- Fix incompatible pointer type warning
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.31-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.31-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 12 2023 Jerry James <loganjerry@gmail.com> - 4.31-6
+- Update for split GAP directories
+
+* Thu Nov 10 2022 Jerry James <loganjerry@gmail.com> - 4.31-5
+- Fix and reenable the tests
+- Clarify license of the doc subpackage
+
+* Tue Sep 27 2022 Jerry James <loganjerry@gmail.com> - 4.31-4
+- Update for gap 4.12.0
+- Convert License tag to SPDX
+- Add -ref patch
+
+* Mon Jul 25 2022 Jerry James <loganjerry@gmail.com> - 4.31-3
+- Rebuild due to changed binary dir name on s390x
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.31-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Feb 21 2022 Jerry James <loganjerry@gmail.com> - 4.31-1
+- Version 4.31
+- Drop upstreamed -buildman patch
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun  3 2021 Jerry James <loganjerry@gmail.com> - 4.30-8
+- Remove unnecessary BR on tex(manfnt.tfm)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Mar 12 2020 Jerry James <loganjerry@gmail.com> - 4.30-5
+- Rebuild for gap 4.11.0
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 25 2019 Jerry James <loganjerry@gmail.com> - 4.30-2
+- Require gap, not gap-core, so the binary can be invoked and the icon be seen
+
+* Wed Apr 24 2019 Jerry James <loganjerry@gmail.com> - 4.30-1
+- New upstream release
+
+* Mon Feb  4 2019 Jerry James <loganjerry@gmail.com> - 4.29-3
+- Rebuild for gap 4.10.0
+- Add -buildman patch
+- Add -doc subpackage
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 15 2018 Jerry James <loganjerry@gmail.com> - 4.29-1
+- New upstream release
+
+* Mon Sep 24 2018 Jerry James <loganjerry@gmail.com> - 4.28-1
+- New upstream release
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Mar 22 2018 Jerry James <loganjerry@gmail.com> - 4.27-1
+- New upstream release
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Nov  7 2016 Jerry James <loganjerry@gmail.com> - 4.26-1
+- New upstream release
+
+* Sat Jul 30 2016 Jerry James <loganjerry@gmail.com> - 4.24-1
+- New upstream release
+- New URLs
+
+* Thu Apr  7 2016 Jerry James <loganjerry@gmail.com> - 4.23-13
+- Rebuild for gap 4.8.3
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.23-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Nov 11 2015 Jerry James <loganjerry@gmail.com> - 4.23-11
+- Simplify scriptlets; gap-core now uses rpm file triggers
+- Rebuild documentation from source
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Jan 24 2015 Jerry James <loganjerry@gmail.com> - 4.23-9
+- Silence scriptlets when uninstalling
+- Mark some content as documentation
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed May 22 2013 Jerry James <loganjerry@gmail.com> - 4.23-5
+- Build with large file support
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Sep 17 2012 Jerry James <loganjerry@gmail.com> - 4.23-3
+- Rebuild for GAP 4.5
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed May  9 2012 Jerry James <loganjerry@gmail.com> - 4.23-1
+- New upstream release
+- Fix bz 819705 issues:
+- Fix xgap shell script
+- Install X11 resource file
+- Turn off autoloading, as that interferes with SAGE
+
+* Mon Apr 23 2012 Jerry James <loganjerry@gmail.com> - 4.22-1
+- New upstream release
+- Add gap-devel BR to get _gap_dir and _gap_arch_dir macros
+
+* Wed Mar 28 2012 Jerry James <loganjerry@gmail.com> - 4.21-3
+- Fix binary permissions
+
+* Fri Feb 17 2012 Jerry James <loganjerry@gmail.com> - 4.21-2
+- Add desktop file
+- Fix inconsistent macro use
+
+* Mon Jan 23 2012 Jerry James <loganjerry@gmail.com> - 4.21-1
+- Initial RPM

sources

@@ -1 +1 @@
-SHA512 (xgap-4.30.tar.gz) = 797f14bb9d94b7902e6ee68664d1c0969605aee29a062bbc76271ca3ac98c58630d982b297bf552c557a56bce8c6194776f2c54ac2c7c2b09705200db0596d3f
+SHA512 (xgap-4.33.tar.gz) = 70055f3f8e81060024f1359831bbfff8a1e0f98f075a560187e9de95fb74ba728ec306a2eef74eea53dcee09b93823e950e82cddfab64160b8f8b98914eaecca

xgap-buildman.patch

@@ -1,11 +0,0 @@
---- doc/buildman.pe.orig	2018-11-10 08:16:08.000000000 -0700
-+++ doc/buildman.pe	2019-01-26 20:35:33.429713783 -0700
-@@ -578,7 +578,7 @@ sub make_tex {
- 
-       SCANMSK: while ( $line = <MSK> ) {
-             # treat the {{...}} replacements
--            while ( $line =~ /{{([^}]*)}}/ ) {
-+            while ( $line =~ /\{\{([^}]*)\}\}/ ) {
-                 $key = $1;
-                 if ( $key =~ /date/ ) {
-                     $replace=`date +"%d %B %Y"`;

xgap-gap-path.patch

@@ -0,0 +1,11 @@
+--- tst/xgap_test.g.orig	2024-02-07 16:26:14.000000000 -0700
++++ tst/xgap_test.g	2025-09-06 14:19:22.424822565 -0600
+@@ -142,7 +142,7 @@ end;
+ XGT_Test:=function(cmd)
+   local GAP_cmd, GAP_dir, stream, mycmd;
+ 
+-  GAP_cmd := Filename(DirectoriesLibrary(""), "gap");
++  GAP_cmd := "/usr/bin/gap";
+   GAP_dir := DirectoryCurrent();
+ 
+   XGT_buf:="";

xgap-gaparch.patch

@@ -1,11 +0,0 @@
---- Makefile.in.orig	2019-04-15 16:27:54.000000000 -0600
-+++ Makefile.in	2019-04-24 10:38:45.822396860 -0600
-@@ -29,7 +29,7 @@
- SHELL=/bin/sh
- CC=@CC@
- @SET_MAKE@
--GAParch=@target@-@CC@
-+GAParch=@GAPARCH@
- 
- default: config compile
- 

xgap-incompatible-pointer.patch

@@ -0,0 +1,25 @@
+Fixes this error:
+
+../../src.x11/xcmds.c: In function ‘FunChangeList’:
+../../src.x11/xcmds.c:715:36: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types]
+  715 |     XawListChange( arg->sel->list, (const char **)text, 0, 0, True );
+      |                                    ^~~~~~~~~~~~~~~~~~~
+      |                                    |
+      |                                    const char **
+In file included from ../../src.x11/utils.h:120,
+                 from ../../src.x11/xcmds.c:9:
+/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’
+  170 |  String                 *list,
+      |  ~~~~~~~~~~~~~~~~~~~~~~~~^~~~
+
+--- src.x11/xcmds.c.orig	2024-02-07 16:26:14.000000000 -0700
++++ src.x11/xcmds.c	2024-03-15 16:59:24.433308375 -0600
+@@ -712,7 +712,7 @@ static Boolean FunChangeList (
+     text[i] = 0;
+ 
+     /* change list */
+-    XawListChange( arg->sel->list, (const char **)text, 0, 0, True );
++    XawListChange( arg->sel->list, text, 0, 0, True );
+ 
+     /* clear old text */
+     for ( i = 0;  arg->sel->text[i];  i++ )

xgap-warning.patch

@@ -1,51 +1,5 @@
---- src.x11/bitmaps/checksym.bm.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/bitmaps/checksym.bm	2019-04-24 10:37:25.662595279 -0600
-@@ -1,5 +1,5 @@
- #define checksym_width 12
- #define checksym_height 12
--static char checksym_bits[] = {
-+static const char checksym_bits[] = {
-    0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x03, 0x80, 0x01, 0xc0, 0x00,
-    0x62, 0x00, 0x36, 0x00, 0x1c, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00};
---- src.x11/bitmaps/emptymk.bm.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/bitmaps/emptymk.bm	2019-04-24 10:37:25.674595249 -0600
-@@ -1,5 +1,5 @@
- #define emptymk_width 12
- #define emptymk_height 12
--static char emptymk_bits[] = {
-+static const char emptymk_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
---- src.x11/bitmaps/exmark.bm.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/bitmaps/exmark.bm	2019-04-24 10:37:25.675595247 -0600
-@@ -1,6 +1,6 @@
- #define exmark_width 32
- #define exmark_height 32
--static char exmark_bits[] = {
-+static const char exmark_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00,
-    0x00, 0x60, 0x03, 0x00, 0x00, 0x60, 0x03, 0x00, 0x00, 0x30, 0x06, 0x00,
-    0x00, 0x30, 0x06, 0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x18, 0x0c, 0x00,
---- src.x11/bitmaps/menusym.bm.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/bitmaps/menusym.bm	2019-04-24 10:37:25.675595247 -0600
-@@ -1,5 +1,5 @@
- #define menusym_width 12
- #define menusym_height 12
--static char menusym_bits[] = {
-+static const char menusym_bits[] = {
-    0xfe, 0x03, 0x02, 0x02, 0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x72, 0x06,
-    0x02, 0x06, 0x72, 0x06, 0x02, 0x06, 0x02, 0x06, 0xfe, 0x07, 0xf8, 0x07};
---- src.x11/bitmaps/return.bm.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/bitmaps/return.bm	2019-04-24 10:37:25.675595247 -0600
-@@ -1,5 +1,5 @@
- #define return_width 9
- #define return_height 7
--static char return_bits[] = {
-+static const char return_bits[] = {
-    0x00, 0x00, 0x44, 0x00, 0x42, 0x00, 0x7d, 0x00, 0x02, 0x00, 0x04, 0x00,
-    0x00, 0x00};
---- src.x11/gapgraph.c.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/gapgraph.c	2019-04-24 10:37:25.676595245 -0600
+--- src.x11/gapgraph.c.orig	2024-02-07 16:26:14.000000000 -0700
++++ src.x11/gapgraph.c	2024-02-09 11:45:26.889608587 -0700
 @@ -121,6 +121,7 @@ static void GapGraphDestroy ( Widget w )
  }
  
@@ -62,14 +16,3 @@
  
  
  /****************************************************************************
---- src.x11/pty.c.orig	2019-04-15 16:27:54.000000000 -0600
-+++ src.x11/pty.c	2019-04-24 10:37:25.677595242 -0600
-@@ -1295,7 +1295,7 @@ int StartGapProcess ( name, argv )
-     String          argv[];
- {
-     Int             j;       /* loop variables                  */
--    char            c[8];    /* buffer for communication        */
-+    char            c[10];   /* buffer for communication        */
-     int             master;  /* pipe to GAP                     */
-     int             n;       /* return value of 'select'        */
-     int             slave;   /* pipe from GAP                   */

xgap.spec

@@ -1,79 +1,93 @@
-Name:           xgap
-Version:        4.30
-Release:        6%{?dist}
+%global gap_pkgname xgap
+%global giturl      https://github.com/gap-packages/xgap
+
+Name:           %{gap_pkgname}
+Version:        4.33
+Release:        %autorelease
 Summary:        GUI for GAP
 
-License:        GPLv2+
+# The project as a whole is GPL-2.0-or-later.
+# src.x11/selfile.{c,h} is HPND.
+License:        GPL-2.0-or-later AND HPND
 URL:            https://gap-packages.github.io/xgap/
-Source0:        https://github.com/gap-packages/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+VCS :           git:%{giturl}.git
+Source0:        %{giturl}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 # Created by Jerry James <loganjerry@gmail.com>
 Source1:        %{name}.desktop
 # Created by Paulo César Pereira de Andrade
 # <paulo.cesar.pereira.de.andrade@gmail.com>
 Source2:        XGap
-# Sent upstream 9 May 2012.  This patch quiets some compiler warnings.
-Patch0:         %{name}-warning.patch
-# Add missing escapes to buildman.pe
-Patch1:         %{name}-buildman.patch
-# Fix computation of GAParch
-Patch2:         %{name}-gaparch.patch
+# This patch quiets a compiler warning.
+Patch:          %{name}-warning.patch
+# Fix FTBFS due to an incompatible pointer type
+Patch:          %{name}-incompatible-pointer.patch
+# Adapt to a change in the gap binary location in gap 4.15.0
+Patch:          %{name}-gap-path.patch
+
+# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+BuildSystem:    gap
+BuildOption(install): bin examples htm lib tst
+BuildOption(check): tst/testall.g
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  gap-devel
+BuildRequires:  gap-devel >= 4.7
+BuildRequires:  gap-pkg-smallgrp-doc
 BuildRequires:  gcc
+BuildRequires:  make
 BuildRequires:  pkgconfig(xaw7)
-BuildRequires:  tex(manfnt.tfm)
 BuildRequires:  tth
 
-Requires:       gap%{?_isa}
+Requires:       gap%{?_isa} >= 4.7
 
-Provides:       gap-pkg-xgap = %{version}-%{release}
+Provides:       gap-pkg-%{gap_pkgname} = %{version}-%{release}
+
+Provides:       gap(XGAP) = %{version}-%{release}
+Provides:       gap(xgap) = %{version}-%{release}
 
 %description
-A X Windows GUI for GAP.
+An X Windows GUI for GAP.
 
 %package doc
+# The content is GPL-2.0-or-later.  The remaining licenses cover the various
+# fonts embedded in PDFs.
+# AMS: OFL-1.1-RFN
+# CM: Knuth-CTAN
+# Nimbus: AGPL-3.0-only
+License:        GPL-2.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND AGPL-3.0-only
 Summary:        XGap documentation
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-Requires:       gap-online-help
+Requires:       gap-pkg-smallgrp-doc
 
 %description doc
-This package contains documentation for %{name}.
+This package contains documentation for %{gap_pkgname}.
 
 %prep
 %autosetup -p0
 
-# Autoloading this package interferes with SAGE (bz 819705).
-sed -i "/^Autoload/s/true/false/" PackageInfo.g 
-
-# Remove references to obsolete GAP manuals
-sed -i '/prg/d;/ext/d' doc/manual.tex
-
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE"
-%configure --with-gaproot=%{_gap_dir}
-make %{?_smp_mflags}
+export CFLAGS='%{build_cflags} -D_GNU_SOURCE'
+%configure --with-gaproot=%{gap_archdir}
+%make_build
 
 # Fix a path in the shell wrapper
 sed -i "s,$PWD,\$GAP_DIR/pkg/%{name}-%{version}," bin/xgap.sh
 
 # Link to main GAP documentation
-ln -s %{_gap_dir}/etc ../../etc
-ln -s %{_gap_dir}/doc ../../doc
+ln -s %{gap_libdir}/etc ../../etc
+ln -s %{gap_libdir}/doc ../../doc
+ln -s %{gap_libdir}/pkg/smallgrp ..
 ln -s %{name}-%{version} ../%{name}
-make -C doc manual
-rm -f ../%{name} ../../{doc,etc}
+cd doc
+./make_doc
+cd -
+rm -f ../%{name} ../smallgrp ../../{doc,etc}
 
-%install
+%install -a
 mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}
-cp -a *.g bin doc examples htm lib %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}
-rm -f %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/doc/*.{aux,bbl,blg,brf,idx,ilg,ind,log,out,pnr}
-rm -f %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/doc/{buildman.*,Makefile,make_doc}
-mv %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/bin/xgap.sh \
-   %{buildroot}%{_bindir}/xgap
-rm -f %{buildroot}%{_gap_dir}/pkg/%{name}-%{version}/bin/*/{Makefile,config*,*.o}
+mv %{buildroot}%{gap_archdir}/pkg/%{name}/bin/xgap.sh %{buildroot}%{_bindir}/xgap
+rm %{buildroot}%{gap_archdir}/pkg/%{name}/bin/*/{Makefile,config*,*.o}
 
 # Install the desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
@@ -84,137 +98,33 @@ desktop-file-install --mode=644 --dir=%{buildroot}%{_datadir}/applications \
 mkdir -p %{buildroot}%{_datadir}/X11/app-defaults
 cp -p %{SOURCE2} %{buildroot}%{_datadir}/X11/app-defaults
 
+%check -p
+# Temporarily modify the test runner to add the necessary -l argument
+sed -i.orig 's|"-p"|"-l","%{buildroot}%{gap_archdir};",&|' \
+   %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g
+
+%check -a
+mv %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g.orig \
+   %{buildroot}%{gap_archdir}/pkg/%{name}/tst/xgap_test.g
+
 %files
 %doc CHANGES README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/X11/app-defaults/XGap
-%{_gap_dir}/pkg/%{name}-%{version}/
-%exclude %{_gap_dir}/pkg/%{name}-%{version}/doc/
-%exclude %{_gap_dir}/pkg/%{name}-%{version}/examples/
-%exclude %{_gap_dir}/pkg/%{name}-%{version}/htm/
+%dir %{gap_archdir}/pkg/%{name}/
+%{gap_archdir}/pkg/%{name}/*.g
+%{gap_archdir}/pkg/%{name}/bin/
+%{gap_archdir}/pkg/%{name}/lib/
+%{gap_archdir}/pkg/%{name}/tst/
 
 %files doc
-%docdir %{_gap_dir}/pkg/%{name}-%{version}/doc/
-%docdir %{_gap_dir}/pkg/%{name}-%{version}/examples/
-%docdir %{_gap_dir}/pkg/%{name}-%{version}/htm/
-%{_gap_dir}/pkg/%{name}-%{version}/doc/
-%{_gap_dir}/pkg/%{name}-%{version}/examples/
-%{_gap_dir}/pkg/%{name}-%{version}/htm/
+%docdir %{gap_archdir}/pkg/%{name}/doc/
+%docdir %{gap_archdir}/pkg/%{name}/examples/
+%docdir %{gap_archdir}/pkg/%{name}/htm/
+%{gap_archdir}/pkg/%{name}/doc/
+%{gap_archdir}/pkg/%{name}/examples/
+%{gap_archdir}/pkg/%{name}/htm/
 
 %changelog
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Mar 12 2020 Jerry James <loganjerry@gmail.com> - 4.30-5
-- Rebuild for gap 4.11.0
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.30-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 25 2019 Jerry James <loganjerry@gmail.com> - 4.30-2
-- Require gap, not gap-core, so the binary can be invoked and the icon be seen
-
-* Wed Apr 24 2019 Jerry James <loganjerry@gmail.com> - 4.30-1
-- New upstream release
-
-* Mon Feb  4 2019 Jerry James <loganjerry@gmail.com> - 4.29-3
-- Rebuild for gap 4.10.0
-- Add -buildman patch
-- Add -doc subpackage
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.29-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Nov 15 2018 Jerry James <loganjerry@gmail.com> - 4.29-1
-- New upstream release
-
-* Mon Sep 24 2018 Jerry James <loganjerry@gmail.com> - 4.28-1
-- New upstream release
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 22 2018 Jerry James <loganjerry@gmail.com> - 4.27-1
-- New upstream release
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.26-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Nov  7 2016 Jerry James <loganjerry@gmail.com> - 4.26-1
-- New upstream release
-
-* Sat Jul 30 2016 Jerry James <loganjerry@gmail.com> - 4.24-1
-- New upstream release
-- New URLs
-
-* Thu Apr  7 2016 Jerry James <loganjerry@gmail.com> - 4.23-13
-- Rebuild for gap 4.8.3
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.23-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Nov 11 2015 Jerry James <loganjerry@gmail.com> - 4.23-11
-- Simplify scriptlets; gap-core now uses rpm file triggers
-- Rebuild documentation from source
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jan 24 2015 Jerry James <loganjerry@gmail.com> - 4.23-9
-- Silence scriptlets when uninstalling
-- Mark some content as documentation
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed May 22 2013 Jerry James <loganjerry@gmail.com> - 4.23-5
-- Build with large file support
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Sep 17 2012 Jerry James <loganjerry@gmail.com> - 4.23-3
-- Rebuild for GAP 4.5
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed May  9 2012 Jerry James <loganjerry@gmail.com> - 4.23-1
-- New upstream release
-- Fix bz 819705 issues:
-- Fix xgap shell script
-- Install X11 resource file
-- Turn off autoloading, as that interferes with SAGE
-
-* Mon Apr 23 2012 Jerry James <loganjerry@gmail.com> - 4.22-1
-- New upstream release
-- Add gap-devel BR to get _gap_dir and _gap_arch_dir macros
-
-* Wed Mar 28 2012 Jerry James <loganjerry@gmail.com> - 4.21-3
-- Fix binary permissions
-
-* Fri Feb 17 2012 Jerry James <loganjerry@gmail.com> - 4.21-2
-- Add desktop file
-- Fix inconsistent macro use
-
-* Mon Jan 23 2012 Jerry James <loganjerry@gmail.com> - 4.21-1
-- Initial RPM
+%autochangelog