The package rpms/gap-pkg-semigroups.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-semigroups.git/commit/?id=b1... https://src.fedoraproject.org/cgit/rpms/gap-pkg-semigroups.git/commit/?id=85....
Change: -%ifnarch aarch64 +%ifnarch aarch64
Thanks.
Full change: ============
commit b1293c5dcd78f978295009693e16e35b8a0eaa41 Author: Jerry James loganjerry@gmail.com Date: Tue Mar 24 16:06:00 2020 -0600
Reenable test suite on aarch64.
diff --git a/gap-pkg-semigroups.spec b/gap-pkg-semigroups.spec index d215b86..ff3dada 100644 --- a/gap-pkg-semigroups.spec +++ b/gap-pkg-semigroups.spec @@ -2,7 +2,7 @@
Name: gap-pkg-%{pkgname} Version: 3.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GAP methods for semigroups
License: GPLv3+ @@ -111,8 +111,6 @@ mkdir -p %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version} cp -a bin data doc gap *.g tst %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version} rm -f %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version}/doc/*.{aux,bbl,blg,brf,idx,ilx,ind,log,orig,out,pnr,tex}
-# Work around a possible aarch64-specific gcc bug -%ifnarch aarch64 %check export LC_ALL=C.UTF-8 cd tst @@ -126,7 +124,6 @@ EOF gap -l "%{_gap_dir};%{buildroot}%{_gap_dir}" < teststandard.g %endif cd - -%endif
%files %doc CHANGELOG.md CONTRIBUTING.md README.md VERSIONS @@ -139,6 +136,9 @@ cd - %{_gap_dir}/pkg/%{pkgname}-%{version}/doc/
%changelog +* Tue Mar 24 2020 Jerry James loganjerry@gmail.com - 3.2.4-2 +- Reenable test suite on aarch64 + * Sat Feb 29 2020 Jerry James loganjerry@gmail.com - 3.2.4-1 - Version 3.2.4 - Add -test patch to fix intermittent FTBFS
commit 85964f4a19fdb8a9898896c185642e6cdbf02585 Author: Jerry James loganjerry@gmail.com Date: Sat Mar 21 16:48:33 2020 -0600
Disable test suite on aarch64 until failure can be analyzed.
diff --git a/gap-pkg-semigroups.spec b/gap-pkg-semigroups.spec index ea5530f..d215b86 100644 --- a/gap-pkg-semigroups.spec +++ b/gap-pkg-semigroups.spec @@ -111,6 +111,8 @@ mkdir -p %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version} cp -a bin data doc gap *.g tst %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version} rm -f %{buildroot}%{_gap_dir}/pkg/%{pkgname}-%{version}/doc/*.{aux,bbl,blg,brf,idx,ilx,ind,log,orig,out,pnr,tex}
+# Work around a possible aarch64-specific gcc bug +%ifnarch aarch64 %check export LC_ALL=C.UTF-8 cd tst @@ -124,6 +126,7 @@ EOF gap -l "%{_gap_dir};%{buildroot}%{_gap_dir}" < teststandard.g %endif cd - +%endif
%files %doc CHANGELOG.md CONTRIBUTING.md README.md VERSIONS
commit ca05a8772a176ce2024b157eeba65b29c2645d42 Author: Jerry James loganjerry@gmail.com Date: Sat Mar 21 16:29:46 2020 -0600
Add -test patch to fix intermittent FTBFS. Add -bool-trim patch from upstream to fix bug.
diff --git a/gap-pkg-semigroups-bool-trim.patch b/gap-pkg-semigroups-bool-trim.patch new file mode 100644 index 0000000..92fdbfc --- /dev/null +++ b/gap-pkg-semigroups-bool-trim.patch @@ -0,0 +1,117 @@ +--- doc/boolmat.xml.orig 2020-02-28 09:56:42.000000000 -0700 ++++ doc/boolmat.xml 2020-03-12 14:48:35.094587532 -0600 +@@ -148,10 +148,10 @@ gap> Successors(mat); + is <B>trim</B> if it is both row and column trim. + + <Example><![CDATA[ +-gap> mat := BooleanMat([[0, 1, 1, 0], +-> [1, 0, 1, 1], +-> [1, 1, 0, 1], +-> [0, 1, 1, 1]]);; ++gap> mat := BooleanMat([[0, 0, 1, 1], ++> [1, 0, 1, 0], ++> [1, 1, 0, 0], ++> [0, 1, 0, 1]]);; + gap> IsTrimBooleanMat(mat); + true + gap> mat := BooleanMat([[0, 1, 1, 0], +--- gap/elements/boolmat.gi.orig 2020-02-28 09:56:42.000000000 -0700 ++++ gap/elements/boolmat.gi 2020-03-12 14:51:05.498148858 -0600 +@@ -251,7 +251,8 @@ function(x) + n := Length(x![1]); + for i in [1 .. n - 1] do + for j in [i + 1 .. n] do +- if IsSubsetBlist(x![i], x![j]) then ++ if IsSubsetBlist(x![i], x![j]) or ++ IsSubsetBlist(x![j], x![i]) then + return false; + fi; + od; +@@ -265,18 +266,20 @@ function(x) + local n, contained, row, i, j, k; + + n := Length(x![1]); +- for i in [1 .. n - 1] do +- for j in [i + 1 .. n] do +- contained := true; +- for k in [1 .. n] do +- row := x![k]; +- if (row[j] and not row[i]) then +- contained := false; +- break; ++ for i in [1 .. n] do ++ for j in [1 .. n] do ++ if i <> j then ++ contained := true; ++ for k in [1 .. n] do ++ row := x![k]; ++ if (row[j] and not row[i]) then ++ contained := false; ++ break; ++ fi; ++ od; ++ if contained then ++ return false; + fi; +- od; +- if contained then +- return false; + fi; + od; + od; +--- tst/standard/boolmat.tst.orig 2020-02-28 09:56:42.000000000 -0700 ++++ tst/standard/boolmat.tst 2020-03-12 14:52:21.923909681 -0600 +@@ -217,15 +217,19 @@ gap> x := BooleanMat([[1, 0, 0, 1], + gap> Successors(x); + [ [ 1, 4 ], [ 1, 3 ], [ ], [ 2, 3 ] ] + +-# boolmat: Is(Row/Column)TrimBooleanMat, for a boolean mat, 1/2 +-gap> mat := BooleanMat([[0, 1, 1, 0], ++# boolmat: Is(Row/Column)TrimBooleanMat, for a boolean mat, 1/4 ++gap> mat := BooleanMat([[1, 1, 1, 0], + > [1, 0, 1, 1], + > [1, 1, 0, 1], + > [0, 1, 1, 1]]);; ++gap> IsRowTrimBooleanMat(mat); ++true ++gap> IsColTrimBooleanMat(mat); ++true + gap> IsTrimBooleanMat(mat); + true + +-# boolmat: Is(Row/Column)TrimBooleanMat, for a boolean mat, 2/2 ++# boolmat: Is(Row/Column)TrimBooleanMat, for a boolean mat, 2/4 + gap> mat := BooleanMat([[0, 1, 1, 0], + > [0, 0, 1, 0], + > [1, 0, 0, 1], +@@ -235,6 +239,30 @@ false + gap> IsColTrimBooleanMat(mat); + false + ++# boolmat: Is(Row/Column)TrimBooleanMat, for a boolean mat, 3/4 ++gap> mat := BooleanMat([[1, 0, 1, 0], ++> [0, 0, 1, 0], ++> [1, 0, 0, 1], ++> [1, 1, 1, 0]]);; ++gap> IsRowTrimBooleanMat(mat); ++false ++gap> IsColTrimBooleanMat(mat); ++false ++gap> IsTrimBooleanMat(mat); ++false ++ ++# boolmat: Is(Row/Column)TrimBooleanMat, for a boolean mat, 4/4 ++gap> mat := BooleanMat([[0, 1, 1, 0], ++> [0, 1, 0, 1], ++> [1, 0, 0, 1], ++> [0, 0, 1, 1]]);; ++gap> IsRowTrimBooleanMat(mat); ++true ++gap> IsColTrimBooleanMat(mat); ++false ++gap> IsTrimBooleanMat(mat); ++false ++ + # boolmat: NumberBooleanMat/BooleanMatNumber, for a boolean mat, 1/2 + gap> mat := BooleanMat([[0, 1, 1, 0], + > [1, 0, 1, 1], diff --git a/gap-pkg-semigroups-test.patch b/gap-pkg-semigroups-test.patch new file mode 100644 index 0000000..7d45516 --- /dev/null +++ b/gap-pkg-semigroups-test.patch @@ -0,0 +1,19 @@ +--- tst/standard/congfpmon.tst.orig 2020-02-28 09:56:42.000000000 -0700 ++++ tst/standard/congfpmon.tst 2020-03-12 14:45:40.367420595 -0600 +@@ -228,12 +228,10 @@ false + gap> class1 = class2; + false + gap> enum := Enumerator(class1);; +-gap> enum[3]; +-m2^2 +-gap> enum[11]; +-m1*(m1*m2)^2*m1^3 +-gap> Position(enum, M.1 * (M.1 * M.2) ^ 2 * M.1 ^ 3); +-11 ++gap> M.2 ^ 2 in enum; ++true ++gap> M.1 * (M.1 * M.2) ^ 2 * M.1 ^ 3 in enum; ++true + gap> Size(enum); + 11 + diff --git a/gap-pkg-semigroups.spec b/gap-pkg-semigroups.spec index 1553f75..ea5530f 100644 --- a/gap-pkg-semigroups.spec +++ b/gap-pkg-semigroups.spec @@ -8,6 +8,12 @@ Summary: GAP methods for semigroups License: GPLv3+ URL: http://gap-packages.github.io/Semigroups/ Source0: https://github.com/gap-packages/Semigroups/releases/download/v%%7Bversion%7D... +# Patch the right congruence example the way upstream already changed the +# left congruence example due to a test that sometimes fails. +Patch0: %{name}-test.patch +# Upstream fix for bug in IsRowTrim / IsColTrim for boolean matrices +# https://github.com/gap-packages/Semigroups/commit/463e59c7697367cdcf874e3e78... +Patch1: %{name}-bool-trim.patch
BuildRequires: gap-devel BuildRequires: GAPDoc-doc @@ -132,6 +138,8 @@ cd - %changelog * Sat Feb 29 2020 Jerry James loganjerry@gmail.com - 3.2.4-1 - Version 3.2.4 +- Add -test patch to fix intermittent FTBFS +- Add -bool-trim patch from upstream to fix bug
* Sat Feb 8 2020 Jerry James loganjerry@gmail.com - 3.2.3-1 - Version 3.2.3
commit d5b014492d7e34e5fa96dc09e6fa84de566c7836 Author: Jerry James loganjerry@gmail.com Date: Sat Feb 29 08:43:34 2020 -0700
Version 3.2.4.
diff --git a/gap-pkg-semigroups.spec b/gap-pkg-semigroups.spec index 7854dff..1553f75 100644 --- a/gap-pkg-semigroups.spec +++ b/gap-pkg-semigroups.spec @@ -1,7 +1,7 @@ %global pkgname semigroups
Name: gap-pkg-%{pkgname} -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Summary: GAP methods for semigroups
@@ -130,6 +130,9 @@ cd - %{_gap_dir}/pkg/%{pkgname}-%{version}/doc/
%changelog +* Sat Feb 29 2020 Jerry James loganjerry@gmail.com - 3.2.4-1 +- Version 3.2.4 + * Sat Feb 8 2020 Jerry James loganjerry@gmail.com - 3.2.3-1 - Version 3.2.3
diff --git a/sources b/sources index e98ae67..af0873e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (semigroups-3.2.3.tar.gz) = 981ea43893ccaf00378475fd4c9394a6ef81fe4e21d9733aba7ef9d7d1c842caab79dedca9d67a341a9627a4f390d0d2c0ae51902b6e929e8345fbd22bbeac34 +SHA512 (semigroups-3.2.4.tar.gz) = 7ad3a9e96396e34af33407f557c3e3cbd404a92e9356145ef6e286a2dff7f4a8fe19dcd08a666b1c137a42ddad74e1bfe6ea0826483659ae3df2147de5e4c3f9