10 changed files with 307 additions and 18 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,8 @@
-SOURCES/byacc-20170709.tgz
-/byacc-20170709.tgz
+# Release tarballs.
+byacc-20*.t*gz
+# Signatures.
+byacc-20*.t*gz.asc
+# Generated (source) RPMs.
+*.rpm
+# Expanded source trees.
+byacc-20*/
--- a/byacc.spec
+++ b/byacc.spec
@ -1,14 +1,23 @@
-%define byaccdate 20170709
+%define byaccdate 20230521

 Summary: Berkeley Yacc, a parser generator
 Name: byacc
-Version: 1.9.%{byaccdate}
-Release: 4%{?dist}
-License: Public Domain
-Group: Development/Tools
+Version: 2.0.%{byaccdate}
+Release: 7%{?dist}
+
+# An SPDX license string check done against byacc-20230521 using fossology
+# found strings corresponding to the licenses noted below across the byacc
+# source tree.  byacc is in the public domain, and the "public domain
+# declaration" was documented in fedora-license-data as per Fedora policy
+# via the following commit:
+# https://gitlab.com/fedora/legal/fedora-license-data/-/commit/04ec53689413bb
+License: LicenseRef-Fedora-Public-Domain AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND X11 AND X11-distribute-modifications-variant AND FSFUL
+
 URL: http://invisible-island.net/byacc/byacc.html
 Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gcc
+BuildRequires: make

 %description
 This package provides a parser generator utility that reads a grammar
@ -30,31 +39,121 @@ find . -type f -name \*.c -print0 |

 %build
 %configure --disable-dependency-tracking
-make %{?_smp_mflags}
+%make_build

 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-ln -s yacc $RPM_BUILD_ROOT/%{_bindir}/byacc
-ln -s yacc.1 $RPM_BUILD_ROOT/%{_mandir}/man1/byacc.1
+%make_install
+ln -s yacc %{buildroot}%{_bindir}/byacc
+ln -s yacc.1 %{buildroot}%{_mandir}/man1/byacc.1

 %check
 echo ====================TESTING=========================
 make check
 echo ====================TESTING END=====================

-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README
-%defattr(-,root,root,-)
 %{_bindir}/yacc
 %{_bindir}/byacc
 %{_mandir}/man1/yacc.1*
 %{_mandir}/man1/byacc.1*

 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.0.20230521-7
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0.20230521-6
+- Bump release for June 2024 mass rebuild
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20230521-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20230521-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Nov 08 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230521-3
+- Rebuilt to re-trigger automated bodhi (Fedora Updates System) tests
+
+* Thu Oct 26 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230521-2
+- Analyse byacc sources for license information
+- Migrate License field to SPDX identifiers for
+  https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
+  (#2222081)
+
+* Thu Jun 29 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230521-1
+- Rebase to byacc-2.0.20230521 (#2208910)
+
+* Thu Feb 23 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230219-1
+- Rebase to byacc-2.0.20230219 (#2156901)
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20221106-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Nov 29 2022 Arjun Shankar <arjun@redhat.com> - 2.0.20221106-1
+- Rebase to byacc-2.0-20221106 (#2141488)
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20220128-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Feb 15 2022 Arjun Shankar <arjun@redhat.com> - 2.0-20220128-1
+- Rebase to byacc-2.0-20220128 (#2035590)
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20210808-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Dec 13 2021 Arjun Shankar <arjun@redhat.com> - 2.0-20210808-2
+- Rebuild (#1962986)
+
+* Mon Aug 30 2021 Arjun Shankar <arjun@redhat.com> - 2.0-20210808-1
+- Rebase to byacc-2.0-20210808 (#1962986)
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20210328-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Apr 12 2021 Arjun Shankar <arjun@redhat.com> - 2.0-20210328-1
+- Rebase to byacc-2.0-20210328 (#1943961)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20210109-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2021 Arjun Shankar <arjun@redhat.com> - 2.0-20210109-1
+- Rebase to byacc-2.0-20210109 (#1914591)
+
+* Tue Nov 10 2020 Arjun Shankar <arjun@redhat.com> - 2.0-20200910-1
+- Rebase to byacc-2.0-20200910 (#1877980)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20200330-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20200330-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul  8 2020 Arjun Shankar <arjun@redhat.com> - 1.9.20200330-1
+- Rebase to 20200330 (#1819022)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20191125-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan  8 2020 Arjun Shankar <arjun@redhat.com> - 1.9.20191125-1
+- Rebase to 20191125 (#1768314)
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20190617-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jun 26 2019 Arjun Shankar <arjun@redhat.com> - 1.9.20190617-1
+- Rebase to 20190617
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20170709-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.9.20170709-6
+- Rebuild with fixed binutils
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20170709-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20170709-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,26 @@
 --- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
 product_versions:
  - rhel-8
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tmt-aarch64-x86_64.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tmt-ppc64le-s390x.functional}
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@ -0,0 +1,5 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+execute:
+    how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (byacc-20170709.tgz) = 81b6e2dfe674d7e7650e1583c46f67e20cc5ff56b06ef73a54ec2070abd7f4af1a0db7909f31264d0e6157acd3661c19c3478e06c9bab395f53d0371bc1e9097
+SHA512 (byacc-20230521.tgz) = 9437806510f49a785ab7d4685c56708cd0053d242f1491e9c40af36112d6c6c471e579a75da75980a0356c1c9f319afbb8cc01139d6823511d285e0dd413d9c4
--- a/tests/Regression/upstream-testsuite/Makefile
+++ b/tests/Regression/upstream-testsuite/Makefile
@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/byacc/Regression/upstream-testsuite
+#   Description: Runs the upstream byacc testsuite.
+#   Author: Arjun Shankar <ashankar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/byacc/Regression/upstream-testsuite
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Arjun Shankar <ashankar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Runs the upstream byacc testsuite." >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        30m" >> $(METADATA)
+	@echo "RunFor:          byacc" >> $(METADATA)
+	@echo "Requires:        byacc gcc glibc-devel glibc-headers make sed rpm-build yum-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/tests/Regression/upstream-testsuite/PURPOSE
+++ b/tests/Regression/upstream-testsuite/PURPOSE
@ -0,0 +1,3 @@
+PURPOSE of /tools/byacc/Regression/upstream-testsuite
+Description: Runs the upstream byacc testsuite.
+Author: Arjun Shankar <ashankar@redhat.com>
--- a/tests/Regression/upstream-testsuite/main.fmf
+++ b/tests/Regression/upstream-testsuite/main.fmf
@ -0,0 +1,19 @@
+summary: Runs the upstream byacc testsuite.
+description: ''
+contact: Arjun Shankar <ashankar@redhat.com>
+component:
+- byacc
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- byacc
+- gcc
+- glibc-devel
+- glibc-headers
+- make
+- sed
+- rpm-build
+- yum-utils
+duration: 30m
+extra-summary: /tools/byacc/Regression/upstream-testsuite
+extra-task: /tools/byacc/Regression/upstream-testsuite
--- a/tests/Regression/upstream-testsuite/runtest.sh
+++ b/tests/Regression/upstream-testsuite/runtest.sh
@ -0,0 +1,73 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/byacc/Regression/upstream-testsuite
+#   Description: Runs the upstream byacc testsuite.
+#   Author: Arjun Shankar <ashankar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="byacc"
+REQUIRES="byacc gcc glibc-devel make sed rpm-build"
+MY_USER="byacctestuser"
+DOTEST=$(mktemp)
+
+cat > $DOTEST <<-EOF
+#!/bin/bash
+set -xe
+_BASEDIR=\$1
+_TMP=\$(mktemp -d)
+rpm --define="_topdir \$_TMP" -Uvh \$_BASEDIR/byacc*.src.rpm
+rpmbuild --define="_topdir \$_TMP" -bc \$_TMP/SPECS/byacc.spec
+pushd \$(find \$_TMP/BUILD/ -name yacc -type f -exec dirname {} \;)
+# In case the test fails, the existcode of make check is non-zero.
+# In such case this script fails too because of set -e above.
+make check
+popd
+set -xe
+EOF
+
+rlJournalStart
+    rlPhaseStartSetup
+	rlRun "useradd $MY_USER" 0,9
+	rlRun "chown $MY_USER:$MY_USER $DOTEST"
+        rlAssertRpm --all
+        rlRun "TMP=\$(mktemp -d)"
+	rlRun "chmod a+rx $TMP"
+        rlRun "pushd $TMP"
+        rlFetchSrcForInstalled $PACKAGE
+	rlRun "chmod a+r byacc*.src.rpm"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+	rlRun "su - $MY_USER -c 'bash $DOTEST $(pwd)'"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+	rlRun "popd"
+	rlRun "rm -rf $TMP $DOTEST"
+	rlRun "userdel -f $MY_USER"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd