backport-tests-make-it-easier-to-spot-failures.patch

@@ -1,75 +0,0 @@
-From 4fe5a375fa6cb07f1c5cb6507b3c4e3b38e6fcef Mon Sep 17 00:00:00 2001
-From: Akim Demaille <akim.demaille@gmail.com>
-Date: Sat, 9 Oct 2021 10:29:50 +0200
-Subject: [PATCH] tests: make it easier to spot failures
-
-* examples/c/glr/c++-types.test: Split in several small test cases.
----
- examples/c/glr/c++-types.test | 37 ++++++++++++++++++++++++-----------
- 1 file changed, 26 insertions(+), 11 deletions(-)
-
-diff --git a/examples/c/glr/c++-types.test b/examples/c/glr/c++-types.test
-index 074d72cc..e63dd31e 100644
---- a/examples/c/glr/c++-types.test
-+++ b/examples/c/glr/c++-types.test
-@@ -17,31 +17,46 @@
- 
- cat >input <<EOF
- z + q;
-+EOF
-+run 0 "1.0-5: +(z, q)"
- 
-+cat >input <<EOF
- T x;
-+EOF
-+run 0 "1.0-3: <declare>(T, x)"
- 
-+cat >input <<EOF
- T x = y;
-+EOF
-+run 0 "1.0-7: <init-declare>(T, x, y)"
- 
-+cat >input <<EOF
- x = y;
-+EOF
-+run 0 "1.0-5: =(x, y)"
- 
-+cat >input <<EOF
- T (x) + y;
-+EOF
-+run 0 "1.0-9: +(<cast>(x, T), y)"
- 
-+cat >input <<EOF
- T (x);
-+EOF
-+run 0 "1.0-5: <OR>(<declare>(T, x), <cast>(x, T))"
- 
-+cat >input <<EOF
- T (y) = z + q;
-+EOF
-+run 0 "1.0-13: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q)))"
- 
-+cat >input <<EOF
- T (y y) = z + q;
-+EOF
-+run 0 "1.0-15: <error>
-+err: 1.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'"
- 
-+cat >input <<EOF
- z + q;
- EOF
--run 0 "\
--1.0-5: +(z, q)
--3.0-3: <declare>(T, x)
--5.0-7: <init-declare>(T, x, y)
--7.0-5: =(x, y)
--9.0-9: +(<cast>(x, T), y)
--11.0-5: <OR>(<declare>(T, x), <cast>(x, T))
--13.0-13: <OR>(<init-declare>(T, y, +(z, q)), =(<cast>(y, T), +(z, q)))
--15.0-15: <error>
--17.0-5: +(z, q)
--err: 15.5: syntax error, unexpected identifier, expecting '=' or '+' or ')'"
-+run 0 "1.0-5: +(z, q)"
--- 
-2.27.0
-

bison.spec

@@ -1,13 +1,11 @@
 Name:           bison
-Version:        3.8.2
-Release:        2
+Version:        3.6.4
+Release:        1
 Summary:        A GNU general-purpose parser generator
 License:        GPLv3+
 URL:            http://www.gnu.org/software/bison/
 Source0:        https://ftp.gnu.org/gnu/bison/bison-%{version}.tar.xz
 
-Patch1:     backport-tests-make-it-easier-to-spot-failures.patch
-
 BuildRequires:  gcc-c++ autoconf automake m4 flex
 Requires(post): info
 Requires(preun):info
@@ -40,14 +38,14 @@ Provides:       %{name}-runtime = %{version}-%{release}
 This package contains language support files and locale.
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -p1
 
 %build
 %configure
 %make_build
 
 %check
-%make_build check
+make check
 
 %install
 %make_install
@@ -91,49 +89,19 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/bison-gnulib.mo
 
 %changelog
-* Sat Oct 22 2022 yixiangzhike <yixiangzhike007@163.com> - 3.8.2-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:make it easier to spot tests failures
-
-* Wed Dec 29 2021 wangchen <wangchen137@huawei.com> - 3.8.2-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 3.8.2
-
-* Mon Apr 19 2021 panxiaohe <panxiaohe@huawei.com> - 3.7.4-2
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:use make macros to run check in parallel
-
-* Thu Jan 21 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 3.7.4-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 3.7.4
-
-* Wed Oct 28 2020 wangchen <wangchen137@huawei.com> - 3.7.3-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update to 3.7.3
-
-* Thu Jul 16 2020 wangchen <wangchen137@huawei.com> - 3.6.4-1
+* Thu Jul 16 2020 wangchen <wangchen137@huawei.com> 3.6.4-1
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:update to 3.6.4
 
-* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.5-2
+* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> 3.5-2
 - Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:exclude yacc.gz from help
 
-* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.5-1
+* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> 3.5-1
 - Type:enhancement
 - ID:NA
 - SUG:NA