!22 [sync] PR-20: Cleanup spec

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

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

@@ -0,0 +1,75 @@
+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,14 +1,15 @@
 Name:           bison
-Version:        3.7.3
+Version:        3.8.2
-Release:        1
+Release:        3
 Summary:        A GNU general-purpose parser generator
-License:        GPLv3+
+License:        GPL-3.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH Autoconf-exception-generic AND LGPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND FSFULLR AND GFDL-1.3-or-later AND X11
-URL:            http://www.gnu.org/software/bison/
+URL:            https://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: m4 >= 1.4
-Requires(preun):info
 Provides:       bundled(gnulib)
 
 %description
@@ -27,6 +28,7 @@ programming languages.
 Summary:        -ly library for development using bison-generated parsers
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-static = %{version}-%{release}
+
 %description devel
 This package contains libraries used by programs using bison-generated parsers.
 
@@ -34,80 +36,98 @@ This package contains libraries used by programs using bison-generated parsers.
 Summary:        Language files for bison.
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-runtime = %{version}-%{release}
+Obsoletes:      bison-runtime < %{version}-%{release}
+
 %description lang
 This package contains language support files and locale.
 
 %prep
-%autosetup -p1
+%autosetup -n %{name}-%{version} -p1
 
 %build
 %configure
 %make_build
 
 %check
-make check
+%make_build check
 
 %install
 %make_install
-rm -rf %{buildroot}%{_infodir}/dir
-gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info*
 
-%post help
+# Remove unpackaged files.
-%install_info %{_infodir}/bison.info.gz
+rm -f %{buildroot}/%{_bindir}/yacc
+rm -f %{buildroot}/%{_infodir}/dir
+rm -f %{buildroot}/%{_mandir}/man1/yacc*
+rm -f %{buildroot}/%{_docdir}/%{name}/{AUTHORS,COPYING,NEWS,README,THANKS,TODO}
 
-%preun help
+%find_lang %{name}
-if [ $1 = 0 ];then
+%find_lang %{name}-runtime
-  %install_info_rm %{_infodir}/bison.info.gz
+%find_lang %{name}-gnulib
-fi
 
-%files
+%files -f %{name}.lang -f %{name}-gnulib.lang
-%defattr(-,root,root)
 %license COPYING
-%{_docdir}/%{name}/{AUTHORS,README}
+%{_datadir}/aclocal/bison*.m4
-%{_datadir}/aclocal/bison*
 %{_datadir}/bison
 %{_bindir}/bison
-%exclude %{_bindir}/yacc
-%exclude %{_docdir}/%{name}/COPYING
 
 %files help
-%defattr(-,root,root)
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
-%exclude %{_mandir}/man1/yacc.1.gz
-%{_docdir}/bison/{NEWS,THANKS,TODO}
 %{_mandir}/man1/*
 %{_infodir}/bison*
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/liby.a
-%{_docdir}/bison/examples/*
+%{_docdir}/bison/examples
 
-%files lang
+%files lang -f %{name}-runtime.lang
-%defattr(-,root,root)
-%{_datadir}/locale/*/LC_MESSAGES/bison.mo
-%{_datadir}/locale/*/LC_MESSAGES/bison-runtime.mo
-%{_datadir}/locale/*/LC_MESSAGES/bison-gnulib.mo
 
 %changelog
-* Wed Oct 28 2020 wangchen <wangchen137@huawei.com> 3.7.3-1
+* Fri Aug 09 2024 Funda Wang <fundawang@yeah.net> - 3.8.2-3
+- Cleanup spec
+
+* 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