The package rpms/gap-pkg-ace.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-ace.git/commit/?id=f77716....
Change:
+ExclusiveArch: aarch64 ppc64le s390x x86_64
Thanks.
Full change:
============
commit f77716a1866c347b95cb234d440eea7f13a5528e
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Sep 27 09:19:33 2022 -0600
Version 5.6.1.
- Drop upstreamed patches.
- Update for gap 4.12.0.
diff --git a/gap-pkg-ace-noreturn.patch b/gap-pkg-ace-noreturn.patch
deleted file mode 100644
index cb9e34e..0000000
--- a/gap-pkg-ace-noreturn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ace-5.5/src/al2.h.orig 2022-08-01 05:49:59.000000000 -0600
-+++ ace-5.5/src/al2.h 2022-08-02 08:16:09.662034080 -0600
-@@ -22,6 +22,7 @@ application in the form of a stand alone
- #include "al1.h"
-
- #include <setjmp.h> /* Needed for setjmp/longjmp jmp_buf type */
-+#include <stdnoreturn.h>
-
- extern jmp_buf env; /* Environment for error-recovery jump */
-
-@@ -82,13 +83,9 @@ extern int intcnt, intarr[32];
- void al2_init(void);
- char *al2_strdup(char*);
- int al2_outlen(int);
--void al2_continue(char*);
--#ifdef __GNUC__
--void al2_restart(char*) __attribute__ ((noreturn));
--#else
--void al2_restart(char*);
--#endif
--void al2_abort(char*);
-+noreturn void al2_continue(char*);
-+noreturn void al2_restart(char*);
-+noreturn void al2_abort(char*);
-
- void al2_aip(char*);
- void al2_aop(char*);
diff --git a/gap-pkg-ace-uninit.patch b/gap-pkg-ace-uninit.patch
deleted file mode 100644
index 71a48f4..0000000
--- a/gap-pkg-ace-uninit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fixes these warnings:
-
-enum.c: In function 'al0_cl':
-enum.c:394:6: warning: 'k' may be used uninitialized [-Wmaybe-uninitialized]
- 394 | if (k == 0)
- | ^
-enum.c:362:30: note: 'k' was declared here
- 362 | int row,col,beg,end,i,j,ji,k;
- | ^
-enum.c: In function 'al0_rl.constprop.0':
-enum.c:295:6: warning: 'l' may be used uninitialized [-Wmaybe-uninitialized]
- 295 | if (l == 0)
- | ^
-enum.c:267:24: note: 'l' was declared here
- 267 | int row,rel,i,ii,j,k,l;
- | ^
-
---- a/src/enum.c 2022-03-09 09:54:56.000000000 -0700
-+++ b/src/enum.c 2022-03-10 09:20:26.601397348 -0700
-@@ -264,7 +264,7 @@ int al0_apply(int cos, int *beg, int *en
-
- static int al0_rl(int first, int last, Logic saved)
- {
-- int row,rel,i,ii,j,k,l;
-+ int row,rel,i,ii,j,k,l = 0;
- int *pj, *pk, *fwd, *bwd;
- int ifront, iback;
-
-@@ -359,7 +359,7 @@ static int al0_rl(int first, int last, L
-
- static int al0_cl(int first, int last, Logic saved)
- {
-- int row,col,beg,end,i,j,ji,k;
-+ int row,col,beg,end,i,j,ji,k = 0;
- int *pj, *pk, *fwd, *bwd;
- int ifront, iback;
-
diff --git a/gap-pkg-ace-utsname.patch b/gap-pkg-ace-utsname.patch
deleted file mode 100644
index e6e1a50..0000000
--- a/gap-pkg-ace-utsname.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ace-5.5/src/ace.c.orig 2022-08-01 05:49:59.000000000 -0600
-+++ ace-5.5/src/ace.c 2022-08-02 08:25:31.535248909 -0600
-@@ -65,9 +65,14 @@ int main(void)
- any other information regarding the current host that is required. */
-
- #ifdef AL2_HINFO
-+#include <sys/utsname.h>
- fprintf(fop, "Host information:\n");
- fflush(fop);
-- system("echo \" name = `uname -n`\"");
-+ {
-+ struct utsname name;
-+ if (uname(&name) == 0)
-+ fprintf(fop, " name = %s\n", name.nodename);
-+ }
- #endif
-
- switch(setjmp(env))
diff --git a/gap-pkg-ace.spec b/gap-pkg-ace.spec
index 96ddf37..9829282 100644
--- a/gap-pkg-ace.spec
+++ b/gap-pkg-ace.spec
@@ -1,19 +1,14 @@
%global pkgname ace
Name: gap-pkg-%{pkgname}
-Version: 5.5
+Version: 5.6.1
Release: 1%{?dist}
Summary: Advanced Coset Enumerator
License: MIT
+ExclusiveArch: aarch64 ppc64le s390x x86_64
URL:
https://gap-packages.github.io/ace/
Source0:
https://github.com/gap-packages/ace/releases/download/v%{version}/%{pkgna...
-# Add the noreturn attribute to more functions for better diagnostics
-Patch0: %{name}-noreturn.patch
-# Initialize two variables that might be used uninitialized
-Patch1: %{name}-uninit.patch
-# Make a call to the uname system call instead of invoking system()
-Patch2: %{name}-utsname.patch
BuildRequires: gap-devel
BuildRequires: gcc
@@ -44,14 +39,19 @@ This package contains documentation for gap-pkg-%{pkgname}.
%prep
%autosetup -p1 -n %{pkgname}-%{version}
+# Do not force C90 mode
+sed -i 's/-pedantic -ansi/-pedantic/' src/Makefile
+
%build
+export LC_ALL=C.UTF-8
+
# This is NOT an autoconf-generated script. Do not use %%configure.
-./configure %{_gap_dir}
-%make_build EXTRA_CFLAGS='%{build_cflags}' LDFLAGS='%{build_ldflags}'
+./configure %{gap_dir}
+%make_build
# Link to main GAP documentation
-ln -s %{_gap_dir}/doc ../../doc
-ln -s %{_gap_dir}/etc ../../etc
+ln -s %{gap_dir}/doc ../../doc
+ln -s %{gap_dir}/etc ../../etc
make doc
rm -f ../../{doc,etc}
@@ -61,37 +61,42 @@ ps2pdf ace3001.ps ace3001.pdf
popd
%install
-mkdir -p %{buildroot}%{_gap_dir}/pkg
-cp -a ../%{pkgname}-%{version} %{buildroot}%{_gap_dir}/pkg
-rm -f
%{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version}/{.package_note*,CHANGES.md,configure,LICENSE,Makefile*,README.md,doc/make_doc,gap/CHANGES}
-rm -f
%{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version}/doc/*.{aux,bbl,blg,brf,idx,ilg,ind,log,out,pnr}
-rm -fr %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version}/{doc/test,src,standalone-doc}
+mkdir -p %{buildroot}%{gap_dir}/pkg/%{pkgname}/doc
+cp -a *.g bin examples gap htm res-examples tst VERSION \
+ %{buildroot}%{gap_dir}/pkg/%{pkgname}
+rm %{buildroot}%{gap_dir}/pkg/%{pkgname}/gap/CHANGES
+%gap_copy_docs
%check
-gap -l "%{buildroot}%{_gap_dir};%{_gap_dir}" < tst/testall.g
+export LC_ALL=C.UTF-8
+gap -l "%{buildroot}%{gap_dir};" tst/testall.g
%files
%doc CHANGES.md README.md
%license LICENSE
-%{_gap_dir}/pkg/%{pkgname}-%{version}/
-%exclude %{_gap_dir}/pkg/%{pkgname}-%{version}/doc/
-%exclude %{_gap_dir}/pkg/%{pkgname}-%{version}/examples/
-%exclude %{_gap_dir}/pkg/%{pkgname}-%{version}/htm/
-%exclude %{_gap_dir}/pkg/%{pkgname}-%{version}/res-examples/
+%{gap_dir}/pkg/%{pkgname}/
+%exclude %{gap_dir}/pkg/%{pkgname}/doc/
+%exclude %{gap_dir}/pkg/%{pkgname}/examples/
+%exclude %{gap_dir}/pkg/%{pkgname}/htm/
+%exclude %{gap_dir}/pkg/%{pkgname}/res-examples/
%files doc
%doc standalone-doc/ace3001.pdf
-%license LICENSE
-%docdir %{_gap_dir}/pkg/%{pkgname}-%{version}/doc/
-%docdir %{_gap_dir}/pkg/%{pkgname}-%{version}/examples/
-%docdir %{_gap_dir}/pkg/%{pkgname}-%{version}/htm/
-%docdir %{_gap_dir}/pkg/%{pkgname}-%{version}/res-examples/
-%{_gap_dir}/pkg/%{pkgname}-%{version}/doc/
-%{_gap_dir}/pkg/%{pkgname}-%{version}/examples/
-%{_gap_dir}/pkg/%{pkgname}-%{version}/htm/
-%{_gap_dir}/pkg/%{pkgname}-%{version}/res-examples/
+%docdir %{gap_dir}/pkg/%{pkgname}/doc/
+%docdir %{gap_dir}/pkg/%{pkgname}/examples/
+%docdir %{gap_dir}/pkg/%{pkgname}/htm/
+%docdir %{gap_dir}/pkg/%{pkgname}/res-examples/
+%{gap_dir}/pkg/%{pkgname}/doc/
+%{gap_dir}/pkg/%{pkgname}/examples/
+%{gap_dir}/pkg/%{pkgname}/htm/
+%{gap_dir}/pkg/%{pkgname}/res-examples/
%changelog
+* Tue Sep 27 2022 Jerry James <loganjerry(a)gmail.com> - 5.6.1-1
+- Version 5.6.1
+- Drop upstreamed patches
+- Update for gap 4.12.0
+
* Tue Aug 2 2022 Jerry James <loganjerry(a)gmail.com> - 5.5-1
- Version 5.5
- Add -utsname patch to remove coreutils dependency
diff --git a/sources b/sources
index 6bdf162..55cae49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ace-5.5.tar.gz) =
685dce33c7ac0c0d7cff909ae789c957c0b89932d3dfb6657908978c3f1c97c3a1ad3e59e7121cab6247eca75fbf02168b871f6ac4658c61554b379456afd4a9
+SHA512 (ace-5.6.1.tar.gz) =
8fd569360e75ef2966bb23c11aa370814f179eb5874e8b8d8490d547e0cb5f31872d6913428edfd190eabe87edef5de27dc0c0af3897a2b970a90f47ca5bf7c0