From 8babbcd1623eacb361687fb864999c02d76c47b5 Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 22 Jan 2005 07:11:02 +0000 Subject: [PATCH 01/32] Set up to use the "make download" machinery. --- Makefile | 3 +++ mirrors | 1 + upstream | 1 + upstream-key.gpg | 28 ++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 mirrors create mode 100644 upstream create mode 100644 upstream-key.gpg diff --git a/Makefile b/Makefile index 94c9972..db207f5 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,7 @@ NAME := bison SPECFILE = $(firstword $(wildcard *.spec)) +# Check the right flavor of signature file for ftp.gnu.org site. +UPSTREAM_CHECKS = sig + include ../common/Makefile.common diff --git a/mirrors b/mirrors new file mode 100644 index 0000000..7aaad0b --- /dev/null +++ b/mirrors @@ -0,0 +1 @@ +http://ftp.gnu.org/gnu/bison diff --git a/upstream b/upstream new file mode 100644 index 0000000..8edd080 --- /dev/null +++ b/upstream @@ -0,0 +1 @@ +bison-2.0.tar.gz diff --git a/upstream-key.gpg b/upstream-key.gpg new file mode 100644 index 0000000..0840349 --- /dev/null +++ b/upstream-key.gpg @@ -0,0 +1,28 @@ +pub 1024D/69A4726B 2003-08-07 Paul Eggert + Key fingerprint = 0977 7580 951C E87F 0F3C 83B5 D61E CB34 69A4 726B +sub 1024g/19F945E3 2003-08-07 [expires: 2004-08-06] + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.4 (GNU/Linux) + +mQGiBD8yt+oRBADkmVuWjrl0k0lrYOdaczAslirKeiayAd8868d7V6GzfFc/HES4 +tFhi+okVybTAUJ6i4oKmIV0c5pNyzZ3TErHYFb40RP0FgW39SMgAIQ/H/kBMSjrq +jQNQi9TsXolNc2v+8rkYGRkR20PiIUwKxeZvgB6tyMNFTb9/NrwqNM+E2wCgobBp +1S/UnaRfYRt+CYH91TTTPWUD/jW/S9ddc0yXOwx2f99f+gIJ6KIQmRihP3LvTdlf +vWwv1M8y9uWteXP11rcmvdRryL40irKP3gUnBHo7h3+vicTlG/YV0lvVPzo12mgO +6yEO1eJmxYYkqeQ4Tzy95SG1xuoEYK6daOHPAZTBdoUCHJXaJhxbllPSgx6F0taT +S4u9BADgXDuE1lduOsQeIa8LadO7MtRdCC+lpuh6OErNnHgVCBnOJzIWY6Vtw0mZ +nvKvwQCTbgwC5ZF2VdcfKfnNsz1Uc/tie7bGo4rz1CnHMokRT6+CMpkSg0+8CAFM +LSYIZP0Bs4YCD1XxoVef/3xqULSzY9tEc0hB/eCOfuXCFiHbuLQcUGF1bCBFZ2dl +cnQgPGVnZ2VydEBnbnUub3JnPohdBBMRAgAdBQI/MrfrBQkB4TOABQsHCgMEAxUD +AgMWAgECF4AACgkQ1h7LNGmkcmsIhwCdEqoVFmJzghAzkqwDlO+zO8vwNZMAn13H +cKAWAkQ1XttffFpQ4g63o5CYuQENBD8yt+0QBACVjyAOjVJIv/H7mCYAIdx1mF+U +BOIZzEKsJnqIR+8DZvDsmY6dvkvDEETlMlE3D+mH+CuNylDsHChDKBVTonrKsPdl +woVjkh2lQ5x67U929cNpJ3O5+Y3DxiANj1NPV3rgUePO/HxqFnRZdWtw6kXcnDgQ +ELVhB2ngzU1Jxfu9YwADBgP/UkK5GfBuhqY/5UessEZNs2vzRoVe/jsj4AF0zUfO +37FbUllURV+3bK6knN6L/l77mDGh/oHqBr4drewxWN9EQMB8lhKHVunazmQ7kTcZ +O8xnZQubASTnM6Hd7OL4wJAcpVyQOBaVsPDOf0vlqCHX+xj1T+mxJPhqZrHqmJeV +j2iITAQYEQIADAUCPzK37QUJAeEzgAAKCRDWHss0aaRya+jOAJ96m9tB9UFY36ou +H9CzH0gE60M9mACfXqEHT1kDN+s5z64kiKr0lNe3+9E= +=ur9y +-----END PGP PUBLIC KEY BLOCK----- From 5e361b88bd6157cc0055714dc64909dec11db7b1 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 15 Mar 2005 00:44:46 +0000 Subject: [PATCH 02/32] Bump for gcc4 rebuild. --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index 51ce448..bda3f2a 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.0 -Release: 4 +Release: 5 License: GPL Group: Development/Tools #Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -80,6 +80,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 14 2005 Roland McGrath - 2.0-5 +- rebuilt + * Thu Jan 6 2005 Roland McGrath - 2.0-4 - update upstream URLs, add doc files (#144346) From 1dd1351c0409028aa7d5efdf2b3a4293eb293a8e Mon Sep 17 00:00:00 2001 From: roland Date: Fri, 8 Apr 2005 03:40:57 +0000 Subject: [PATCH 03/32] Add %check section. --- bison.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index bda3f2a..1b93781 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.0 -Release: 5 +Release: 6 License: GPL Group: Development/Tools #Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -44,6 +44,10 @@ simple programs to supply minimal support for the generated parsers. %configure make +%check +make check +#make maintainer-check + %install rm -rf $RPM_BUILD_ROOT %makeinstall @@ -80,6 +84,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 7 2005 Roland McGrath - 2.0-6 +- run test suite in %%check + * Mon Mar 14 2005 Roland McGrath - 2.0-5 - rebuilt From 2b7635275655191e26f21d3c735feb7c24348dca Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 15 Oct 2005 00:43:37 +0000 Subject: [PATCH 04/32] New upstream version 2.1 --- .cvsignore | 2 +- bison.spec | 27 ++++++++++++++++++++++----- sources | 2 +- upstream | 2 +- upstream-key.gpg | 34 +++++++++++++++++++++++++++------- 5 files changed, 52 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8edd080..807af01 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bison-2.0.tar.gz +bison-2.1.tar.bz2 diff --git a/bison.spec b/bison.spec index 1b93781..3e3c1de 100644 --- a/bison.spec +++ b/bison.spec @@ -1,11 +1,10 @@ Summary: A GNU general-purpose parser generator. Name: bison -Version: 2.0 -Release: 6 +Version: 2.1 +Release: 1 License: GPL Group: Development/Tools -#Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 -Source: http://ftp.gnu.org/gnu/bison/bison-%{version}.tar.gz +Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 Url: http://www.gnu.org/software/bison/ Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-root @@ -37,6 +36,16 @@ using Bison, you might want to link with this library. This library is required by all Bison-generated parsers, but may be employed by simple programs to supply minimal support for the generated parsers. +%package runtime +Summary: Runtime support files used by Bison-generated parsers +Group: Development/Libraries + +%description runtime +The bison-runtime package contains files used at runtime by parsers +that Bison generates. Packages whose binaries contain parsers +generated by Bison should depend on bison-runtime to ensure that +these files are available. + %prep %setup -q @@ -57,6 +66,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/yacc rm -f $RPM_BUILD_ROOT/%{_infodir}/dir %find_lang %{name} +%find_lang %{name}-runtime gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info* @@ -70,11 +80,14 @@ fi %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog NEWS OChangeLog README REFERENCES THANKS TODO doc/FAQ +%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO doc/FAQ %{_mandir}/*/bison* %{_datadir}/bison %{_infodir}/bison.info* %{_bindir}/bison +%{_datadir}/aclocal/bison*.m4 + +%files -f %{name}-runtime.lang runtime %files devel %defattr(-,root,root) @@ -84,6 +97,10 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 14 2005 Roland McGrath - 2.1-1 +- New upstream version 2.1 +- New subpackage bison-runtime for i18n support files used by parsers. + * Thu Apr 7 2005 Roland McGrath - 2.0-6 - run test suite in %%check diff --git a/sources b/sources index 2aadfe5..24f9734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c17f964fd5504b88b07a183420de25e3 bison-2.0.tar.gz +ef3110077462b1140b2ae612626e8486 bison-2.1.tar.bz2 diff --git a/upstream b/upstream index 8edd080..807af01 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -bison-2.0.tar.gz +bison-2.1.tar.bz2 diff --git a/upstream-key.gpg b/upstream-key.gpg index 0840349..7e88f82 100644 --- a/upstream-key.gpg +++ b/upstream-key.gpg @@ -1,9 +1,5 @@ -pub 1024D/69A4726B 2003-08-07 Paul Eggert - Key fingerprint = 0977 7580 951C E87F 0F3C 83B5 D61E CB34 69A4 726B -sub 1024g/19F945E3 2003-08-07 [expires: 2004-08-06] - -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.4 (GNU/Linux) +Version: GnuPG v1.4.1 (GNU/Linux) mQGiBD8yt+oRBADkmVuWjrl0k0lrYOdaczAslirKeiayAd8868d7V6GzfFc/HES4 tFhi+okVybTAUJ6i4oKmIV0c5pNyzZ3TErHYFb40RP0FgW39SMgAIQ/H/kBMSjrq @@ -23,6 +19,30 @@ ELVhB2ngzU1Jxfu9YwADBgP/UkK5GfBuhqY/5UessEZNs2vzRoVe/jsj4AF0zUfO 37FbUllURV+3bK6knN6L/l77mDGh/oHqBr4drewxWN9EQMB8lhKHVunazmQ7kTcZ O8xnZQubASTnM6Hd7OL4wJAcpVyQOBaVsPDOf0vlqCHX+xj1T+mxJPhqZrHqmJeV j2iITAQYEQIADAUCPzK37QUJAeEzgAAKCRDWHss0aaRya+jOAJ96m9tB9UFY36ou -H9CzH0gE60M9mACfXqEHT1kDN+s5z64kiKr0lNe3+9E= -=ur9y +H9CzH0gE60M9mACfXqEHT1kDN+s5z64kiKr0lNe3+9GZAaIEQuEYHxEEAP1h6Eyn +sdMRGwx3/tlUoeHFjVe7fkN/JzlL5Z6oao+Y/Yf2ESBg/XB0/8FaS7CTQMHKChip +a9Wivp+GiqzKCewULYLApLUS5WO+xJ8wGPIShIUh33Vups7rR7JGqQ98pxbTk8E/ +36zRUH6R6g0H9DPZbUxKZDWELKKSegYu3FQ7AKCpqJc9Vq8GTgFflXlGYffSENVk +CwP/VMH3PtBfPRgwqiUrydXT95zogct+RivNzwzIsKxi+0w1BhYdCLNgXD7TA3lT +QsgLytskVer1T1dmp6bwH5ZW05iTzSOQqq8EI4sA5AYq5JIvUmIRYKg5R+LGuDxP +8Ruvw53NSE1hLtsC+qiQxHqcDK+t2vf8nSU7bcom92OuDZoD/3JEYfumdlrt/BR/ +Vv/dqG9kKLCoXNbuV+X4Aq8RTSOszopBUc+TJIqZNaAq13n4XUDqznhmlWq0d5x2 +CWQimDQzMn/2vjacJ/MNTdxcw+7s/rjnFy/LBWT/cRuUxgk3B+wlDHp4z5V1HLWF +ed49y4OHWxF7qvONM3ccwABW/xnvtCBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVj +bGEuZWR1PohkBBMRAgAkBQJC4RgfAhsDBQkFo5qABgsJCAcDAgMVAgMDFgIBAh4B +AheAAAoJELk/YMa1xM4TocEAoI6ngp3vBGXrLRkFFibu5kNbFoIvAKClFUC21RFB +xrC1eZoD2/df9IG/pLkCDQRC4RguEAgAutFBZGkpmjmVPG16cZDdXcAEEyKxse+s +W3ftiv/h8x2cvEmy8x3A2tuCWf5gSJ3viawdkAp5w9d42IoC4O3COF3B7nRpR6FU +6o193OXLrJhNjmBV5iGgyLZfkxuA686J7BP2yxUSzwJjAhyk1S+70sg3cygMLDT0 +EsID1n0Y5HWFHP5DkfNhIh0Kh4gqsCQBytO8cD/hsVSSbz+9ttDSV/LIzcCUgkJe +O5HkxSnd/3CYB2FBIzlM0XIWvEoZ/z6shroIySIGZlxnbZXFO//nVEC4EHQ7JKyj +7X+HvH2lumkjSnX51X0hmqBjeRvFK2gIu59DyZRTHiXtXE4Mdy+kXwADBQf+Ptps +V+WJ1BuemoEmaDgNCuO+JxH1D04/ux7PXCxZKU1+k4vtwdDPXSDpWxpGD8XWgN9C +if06GWHejBTgTRQoy4ygiBAo8B/vUQZdBL80z6rUuIOVg/EBUDiJV0Pz6Z7dwKfv +Bb2+F8flhqJDdPLs6VxYddd5ZemXbBBe2KanIsyP7Pk586sTzuU7PMTcEMcizkzg +HiMTY8zBd8+dBM7hn30/NORLsEfJpf+E4eC72TpJK4ZRfZpk03rMWBoZFziCfxjL +XUOB44tQK0yn53vreX1jcc5urmI4z7j7yD3sypkYCwn7gpwyxPB9A6zDf9HyvWpf +um6/jkof6fvV+OcRrYhPBBgRAgAPBQJC4RguAhsMBQkFo5qAAAoJELk/YMa1xM4T +y7QAmgPizj1fRazw/BFTyStLPjUAFXNlAKCnTTwKv96JkWTxcIILLfibPRmnFw== +=rfoO -----END PGP PUBLIC KEY BLOCK----- From eb37b37dd9acb433bd5a0a8a74b4826d7ccc68f0 Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 15 Oct 2005 00:45:56 +0000 Subject: [PATCH 05/32] Description fixes. --- bison.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bison.spec b/bison.spec index 3e3c1de..cd2b249 100644 --- a/bison.spec +++ b/bison.spec @@ -33,7 +33,7 @@ Group: Development/Libraries The bison-devel package contains the -ly library sometimes used by programs using Bison-generated parsers. If you are developing programs using Bison, you might want to link with this library. This library -is required by all Bison-generated parsers, but may be employed by +is not required by all Bison-generated parsers, but may be employed by simple programs to supply minimal support for the generated parsers. %package runtime @@ -44,7 +44,8 @@ Group: Development/Libraries The bison-runtime package contains files used at runtime by parsers that Bison generates. Packages whose binaries contain parsers generated by Bison should depend on bison-runtime to ensure that -these files are available. +these files are available. See the Internationalization in the +Bison manual section for more information. %prep %setup -q From a00a2e3148de6c8cba3d21a2ee4d52450e789ed2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 22:39:47 +0000 Subject: [PATCH 06/32] gcc update bump --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index cd2b249..31e6da5 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.1 -Release: 1 +Release: 1.1 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -98,6 +98,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Fri Oct 14 2005 Roland McGrath - 2.1-1 - New upstream version 2.1 - New subpackage bison-runtime for i18n support files used by parsers. From a7b544b8fcde26120e32a334bc283a2a02bf099b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 7 Feb 2006 11:09:29 +0000 Subject: [PATCH 07/32] bump for new gcc/glibc --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index 31e6da5..afc4ad9 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.1 -Release: 1.1 +Release: 1.2 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -98,6 +98,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 07 2006 Jesse Keating - 2.1-1.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + * Fri Dec 09 2005 Jesse Keating - rebuilt From 24491699a4a8dd0435703781e89b2ac838a68e66 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 11 Feb 2006 02:08:38 +0000 Subject: [PATCH 08/32] bump for bug in double-long on ppc(64) --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index afc4ad9..ce8acb9 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.1 -Release: 1.2 +Release: 1.2.1 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -98,6 +98,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 10 2006 Jesse Keating - 2.1-1.2.1 +- bump again for double-long bug on ppc(64) + * Tue Feb 07 2006 Jesse Keating - 2.1-1.2 - rebuilt for new gcc4.1 snapshot and glibc changes From 92c5f559aefa499cd8cb7873545ff77243cd839e Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 2 May 2006 03:29:05 +0000 Subject: [PATCH 09/32] Fix K&R parser definition when it has no arguments (#190376). --- bison.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bison.spec b/bison.spec index ce8acb9..c4fb765 100644 --- a/bison.spec +++ b/bison.spec @@ -1,15 +1,17 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.1 -Release: 1.2.1 +Release: 2 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 -Url: http://www.gnu.org/software/bison/ +URL: http://www.gnu.org/software/bison/ Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-root Requires: m4 >= 1.4 +Patch1: bison-2.1-m4_map.patch + %description Bison is a general purpose parser generator that converts a grammar description for an LALR(1) context-free grammar into a C program to @@ -50,6 +52,8 @@ Bison manual section for more information. %prep %setup -q +%patch1 -p1 + %build %configure make @@ -98,6 +102,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 1 2006 Roland McGrath - 2.1-3 +- Fix K&R parser definition when it has no arguments (#190376). + * Fri Feb 10 2006 Jesse Keating - 2.1-1.2.1 - bump again for double-long bug on ppc(64) From 808882d9c30afd6a5d996e2ed02c20f359f58a86 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 2 May 2006 03:32:56 +0000 Subject: [PATCH 10/32] oops --- bison.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index c4fb765..48fd529 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.1 -Release: 2 +Release: 3 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 From 680eca10150b3929d93d34472e93c99c8e365a4e Mon Sep 17 00:00:00 2001 From: roland Date: Mon, 22 May 2006 08:18:32 +0000 Subject: [PATCH 11/32] Import bison-2.2 tarball from upstream. --- .cvsignore | 2 +- sources | 2 +- upstream | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 807af01..52f7677 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bison-2.1.tar.bz2 +bison-2.2.tar.bz2 diff --git a/sources b/sources index 24f9734..5bb3f76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef3110077462b1140b2ae612626e8486 bison-2.1.tar.bz2 +e345a5d021db850f06ce49eba78af027 bison-2.2.tar.bz2 diff --git a/upstream b/upstream index 807af01..52f7677 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -bison-2.1.tar.bz2 +bison-2.2.tar.bz2 From d280d6f0c4ff22eb2417ed1a1ee98ef86a916362 Mon Sep 17 00:00:00 2001 From: roland Date: Mon, 22 May 2006 08:25:38 +0000 Subject: [PATCH 12/32] New upstream version 2.2 --- bison.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bison.spec b/bison.spec index 48fd529..e303b8d 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison -Version: 2.1 -Release: 3 +Version: 2.2 +Release: 1 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -10,8 +10,6 @@ Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-root Requires: m4 >= 1.4 -Patch1: bison-2.1-m4_map.patch - %description Bison is a general purpose parser generator that converts a grammar description for an LALR(1) context-free grammar into a C program to @@ -52,8 +50,6 @@ Bison manual section for more information. %prep %setup -q -%patch1 -p1 - %build %configure make @@ -85,7 +81,7 @@ fi %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO doc/FAQ +%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO %{_mandir}/*/bison* %{_datadir}/bison %{_infodir}/bison.info* @@ -102,6 +98,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 22 2006 Roland McGrath - 2.2-1 +- New upstream version 2.2 + * Mon May 1 2006 Roland McGrath - 2.1-3 - Fix K&R parser definition when it has no arguments (#190376). From d0f8865fd33845f5a248b9fb3151269c6fb356bc Mon Sep 17 00:00:00 2001 From: roland Date: Wed, 7 Jun 2006 20:14:05 +0000 Subject: [PATCH 13/32] Update to bison-2.3 release --- .cvsignore | 2 +- bison-2.3.tar.bz2.sig | Bin 0 -> 65 bytes bison.spec | 5 ++++- sources | 2 +- upstream | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 bison-2.3.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index 52f7677..4980d5b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bison-2.2.tar.bz2 +bison-2.3.tar.bz2 diff --git a/bison-2.3.tar.bz2.sig b/bison-2.3.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000..cdd10e6ac2139a0abe220e87e8e28bd26dfd7b93 GIT binary patch literal 65 zcmV-H0KWf-KLZ5-M1$i0xj$gWwZzU75dt{(0H030sP&<^W~s)zT(r6*Yuf3DP>%qd X2+}w#x(6d3-?PLUW({)Hx@G|b_39oD literal 0 HcmV?d00001 diff --git a/bison.spec b/bison.spec index e303b8d..c8945f8 100644 --- a/bison.spec +++ b/bison.spec @@ -1,6 +1,6 @@ Summary: A GNU general-purpose parser generator. Name: bison -Version: 2.2 +Version: 2.3 Release: 1 License: GPL Group: Development/Tools @@ -98,6 +98,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 7 2006 Roland McGrath - 2.3-1 +- New upstream version 2.3 + * Mon May 22 2006 Roland McGrath - 2.2-1 - New upstream version 2.2 diff --git a/sources b/sources index 5bb3f76..fbbd0f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e345a5d021db850f06ce49eba78af027 bison-2.2.tar.bz2 +c18640c6ec31a169d351e3117ecce3ec bison-2.3.tar.bz2 diff --git a/upstream b/upstream index 52f7677..4980d5b 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -bison-2.2.tar.bz2 +bison-2.3.tar.bz2 From 5406575567874ad094827073ed203362947a34db Mon Sep 17 00:00:00 2001 From: roland Date: Wed, 7 Jun 2006 23:07:22 +0000 Subject: [PATCH 14/32] Add BuildRequires on m4. --- bison.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index c8945f8..54a08fa 100644 --- a/bison.spec +++ b/bison.spec @@ -1,13 +1,14 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 1 +Release: 2 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 URL: http://www.gnu.org/software/bison/ Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-root +BuildRequires: m4 >= 1.4 Requires: m4 >= 1.4 %description @@ -98,6 +99,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 7 2006 Roland McGrath - 2.3-2 +- Add BuildRequires on m4. + * Wed Jun 7 2006 Roland McGrath - 2.3-1 - New upstream version 2.3 From d61b1288e60f8e7a68406251ae8ead48ae08937b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 05:26:54 +0000 Subject: [PATCH 15/32] bumped for rebuild --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index 54a08fa..f8ce240 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 2 +Release: 2.1 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -99,6 +99,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 12 2006 Jesse Keating - 2.3-2.1 +- rebuild + * Wed Jun 7 2006 Roland McGrath - 2.3-2 - Add BuildRequires on m4. From e5dec5b28385fcf8233a876749e601ba333e74aa Mon Sep 17 00:00:00 2001 From: roland Date: Sun, 21 Jan 2007 23:39:54 +0000 Subject: [PATCH 16/32] - Canonicalize post/preun use of install-info. - Resolves: 223679 --- bison.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bison.spec b/bison.spec index f8ce240..b9f891d 100644 --- a/bison.spec +++ b/bison.spec @@ -1,15 +1,16 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 2.1 +Release: 3 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 URL: http://www.gnu.org/software/bison/ -Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-root BuildRequires: m4 >= 1.4 Requires: m4 >= 1.4 +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description Bison is a general purpose parser generator that converts a grammar @@ -73,11 +74,11 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info* %post -/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." +/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." + /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : fi %files -f %{name}.lang @@ -99,6 +100,10 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 21 2007 Roland McGrath - 2.3-3 +- Canonicalize post/preun use of install-info. +- Resolves: 223679 + * Wed Jul 12 2006 Jesse Keating - 2.3-2.1 - rebuild From 77b13fccde3a51594fe6b1b468a19b3984b14133 Mon Sep 17 00:00:00 2001 From: roland Date: Sun, 21 Jan 2007 23:42:08 +0000 Subject: [PATCH 17/32] Use dist tag. --- bison.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index b9f891d..c52db63 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 3 +Release: 3%{?dist} License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 From 3e48cc7f6243a261491906f4ac3f36d696c1e43d Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 28 Aug 2007 17:43:17 +0000 Subject: [PATCH 18/32] Update License: tag and rebuild --- bison.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bison.spec b/bison.spec index c52db63..3fe1b9f 100644 --- a/bison.spec +++ b/bison.spec @@ -1,8 +1,8 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 3%{?dist} -License: GPL +Release: 4%{?dist} +License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 URL: http://www.gnu.org/software/bison/ @@ -100,6 +100,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 28 2007 Roland McGrath - 2.3-4 +- Canonicalize License tag. + * Sun Jan 21 2007 Roland McGrath - 2.3-3 - Canonicalize post/preun use of install-info. - Resolves: 223679 From c53f5532c31c06764ae56f3537fb2d839348d87a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:38:35 +0000 Subject: [PATCH 19/32] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db207f5..9a22653 100644 --- a/Makefile +++ b/Makefile @@ -6,4 +6,19 @@ SPECFILE = $(firstword $(wildcard *.spec)) # Check the right flavor of signature file for ftp.gnu.org site. UPSTREAM_CHECKS = sig -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 7f4fb4fa7c580d8cbcb8587a92853ba0e2484517 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 19:53:29 +0000 Subject: [PATCH 20/32] - Autorebuild for GCC 4.3 --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index 3fe1b9f..f442390 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -100,6 +100,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 2.3-5 +- Autorebuild for GCC 4.3 + * Tue Aug 28 2007 Roland McGrath - 2.3-4 - Canonicalize License tag. From ccc92c3fe973559842fff44e3476de2df30776bb Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 15 Sep 2008 13:17:57 +0000 Subject: [PATCH 21/32] Cleanup per merge review --- bison.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bison.spec b/bison.spec index f442390..376be5a 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ -Summary: A GNU general-purpose parser generator. +Summary: A GNU general-purpose parser generator Name: bison Version: 2.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -81,6 +81,8 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : fi +# The distribution contains also source files. These are used by m4 +# when the target parser file is generated. %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO @@ -100,6 +102,12 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 15 2008 Petr Machata - 2.3-6 +- Merge review: + - Drop terminating dot from Summary + - Escape macros inadvertently left in changelog + - Explain why are there source files in the main package + * Tue Feb 19 2008 Fedora Release Engineering - 2.3-5 - Autorebuild for GCC 4.3 @@ -148,7 +156,7 @@ rm -rf $RPM_BUILD_ROOT - update upstream URLs, add doc files (#144346) * Thu Jan 6 2005 Roland McGrath - 2.0-3 -- missing %defattr for subpackage +- missing %%defattr for subpackage * Thu Jan 6 2005 Roland McGrath - 2.0-2 - split liby.a into bison-devel package From c1a1cdd1ee85fffa65682b5ccc41c6500d15f5f3 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 15 Sep 2008 15:21:02 +0000 Subject: [PATCH 22/32] More merge review changes. --- bison.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bison.spec b/bison.spec index 376be5a..a94392a 100644 --- a/bison.spec +++ b/bison.spec @@ -38,6 +38,16 @@ using Bison, you might want to link with this library. This library is not required by all Bison-generated parsers, but may be employed by simple programs to supply minimal support for the generated parsers. +# -ly is kept static. It only contains two symbols: main and yyerror, +# and both of these are extremely simple (couple lines of C total). +# It doesn't really pay off to introduce a shared library for that. +# +# Therefore -devel subpackage could have been created as -static, but +# the split was done in Jan 2005, which predates current guidelines. +# Besides there is logic to that: the library is devel in the sense +# that the generated parser could be distributed together with other +# sources, and only bison-devel would be necessary to wrap the build. + %package runtime Summary: Runtime support files used by Bison-generated parsers Group: Development/Libraries From 57e649a2b4828cbffcfed2773736a5127769efb0 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 20 Nov 2008 14:33:52 +0000 Subject: [PATCH 23/32] - Rebase to 2.4 - Resolves: #471183 --- .cvsignore | 2 +- bison-2.4-reap_subpipe.patch | 87 ++++++++++++++++++++++++++++++++++++ bison.spec | 13 ++++-- sources | 2 +- 4 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 bison-2.4-reap_subpipe.patch diff --git a/.cvsignore b/.cvsignore index 4980d5b..45e50f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bison-2.3.tar.bz2 +bison-2.4.tar.bz2 diff --git a/bison-2.4-reap_subpipe.patch b/bison-2.4-reap_subpipe.patch new file mode 100644 index 0000000..3f72c3e --- /dev/null +++ b/bison-2.4-reap_subpipe.patch @@ -0,0 +1,87 @@ +diff -urp bison-2.4-pm/lib/subpipe.c bison-2.4/lib/subpipe.c +--- bison-2.4-pm/lib/subpipe.c 2008-07-14 10:56:12.000000000 +0200 ++++ bison-2.4/lib/subpipe.c 2008-11-20 14:37:42.000000000 +0100 +@@ -143,7 +143,9 @@ create_subpipe (char const * const *argv + } + + +-/* Wait for the subprocess to exit. */ ++/* Wait for the subprocess to exit. PROGRAM==NULL means errors ++ shouldn't be emitted, typically becuase we are reaping the subpipe ++ in response to some other error. */ + + void + reap_subpipe (pid_t pid, char const *program) +@@ -151,11 +153,14 @@ reap_subpipe (pid_t pid, char const *pro + #if HAVE_WAITPID || defined waitpid + int wstatus; + if (waitpid (pid, &wstatus, 0) < 0) +- error (EXIT_FAILURE, errno, "waitpid"); ++ { ++ if (program) ++ error (EXIT_FAILURE, errno, "waitpid"); ++ } + else + { + int status = WIFEXITED (wstatus) ? WEXITSTATUS (wstatus) : -1; +- if (status) ++ if (status && program) + error (EXIT_FAILURE, 0, + _(status == 126 + ? "subsidiary program `%s' could not be invoked" +diff -urp bison-2.4-pm/src/output.c bison-2.4/src/output.c +--- bison-2.4-pm/src/output.c 2008-11-02 19:09:10.000000000 +0100 ++++ bison-2.4/src/output.c 2008-11-20 14:39:08.000000000 +0100 +@@ -467,6 +467,21 @@ prepare_actions (void) + | Call the skeleton parser. | + `---------------------------*/ + ++static pid_t pid = 0; ++ ++/* Clean up opened pipe. */ ++static void ++die (void) ++{ ++ static int dying = 0; ++ if (pid && !dying) ++ { ++ dying = 1; ++ reap_subpipe (pid, NULL); ++ pid = 0; ++ } ++} ++ + static void + output_skeleton (void) + { +@@ -474,7 +489,6 @@ output_skeleton (void) + FILE *out; + int filter_fd[2]; + char const *argv[9]; +- pid_t pid; + + /* Compute the names of the package data dir and skeleton files. */ + char const m4sugar[] = "m4sugar/m4sugar.m4"; +@@ -586,6 +600,7 @@ output_skeleton (void) + scan_skel (in); + xfclose (in); + reap_subpipe (pid, m4); ++ pid = 0; + timevar_pop (TV_M4); + } + +@@ -653,6 +669,14 @@ prepare (void) + void + output (void) + { ++ /* Register shutdown handler. */ ++ static int registered = 0; ++ if (!registered) ++ { ++ registered = 1; ++ atexit (die); ++ } ++ + obstack_init (&format_obstack); + + prepare_symbols (); diff --git a/bison.spec b/bison.spec index a94392a..5af8a48 100644 --- a/bison.spec +++ b/bison.spec @@ -1,13 +1,14 @@ Summary: A GNU general-purpose parser generator Name: bison -Version: 2.3 -Release: 6%{?dist} +Version: 2.4 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 +Patch1: bison-2.4-reap_subpipe.patch URL: http://www.gnu.org/software/bison/ BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: m4 >= 1.4 +BuildRequires: m4 >= 1.4 java-1.6.0-openjdk-devel Requires: m4 >= 1.4 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -61,6 +62,7 @@ Bison manual section for more information. %prep %setup -q +%patch1 -p1 %build %configure @@ -77,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT # Remove unpackaged files. rm -f $RPM_BUILD_ROOT/%{_bindir}/yacc rm -f $RPM_BUILD_ROOT/%{_infodir}/dir +rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/yacc* %find_lang %{name} %find_lang %{name}-runtime @@ -112,6 +115,10 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 12 2008 Petr Machata - 2.4-1 +- Rebase to 2.4 +- Resolves: #471183 + * Mon Sep 15 2008 Petr Machata - 2.3-6 - Merge review: - Drop terminating dot from Summary diff --git a/sources b/sources index fbbd0f9..8d8cebd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c18640c6ec31a169d351e3117ecce3ec bison-2.3.tar.bz2 +f95cc7d7f5290157a23216391dec610d bison-2.4.tar.bz2 From 12e15d5fc6fff2fdf22c7a8dc7b10cfade675f51 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 20 Nov 2008 14:35:29 +0000 Subject: [PATCH 24/32] And force-tag doesn't work anymore. --- bison.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bison.spec b/bison.spec index 5af8a48..b6394c2 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator Name: bison Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -115,7 +115,7 @@ fi rm -rf $RPM_BUILD_ROOT %changelog -* Wed Nov 12 2008 Petr Machata - 2.4-1 +* Wed Nov 12 2008 Petr Machata - 2.4-2 - Rebase to 2.4 - Resolves: #471183 From 97fd4650499d1e46f49112e365585cbf31e7d193 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sun, 28 Dec 2008 16:44:51 +0000 Subject: [PATCH 25/32] Rebase to 2.4.1 --- .cvsignore | 1 + bison-2.4.1.tar.bz2.sig | Bin 0 -> 65 bytes bison.spec | 8 ++++++-- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 bison-2.4.1.tar.bz2.sig diff --git a/.cvsignore b/.cvsignore index 45e50f0..4c5ae6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ bison-2.4.tar.bz2 +bison-2.4.1.tar.bz2 diff --git a/bison-2.4.1.tar.bz2.sig b/bison-2.4.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000..189ff8fb878f252a11ea967d6fb880ab768fc266 GIT binary patch literal 65 zcmV-H0KWf-KLZ5-NkNiRAWQJ+@g=?U5dxo(0G~tQ)z0) - 2.4.1-1 +- Rebase to 2.4.1 +- Resolves: #478348 + * Wed Nov 12 2008 Petr Machata - 2.4-2 - Rebase to 2.4 - Resolves: #471183 diff --git a/sources b/sources index 8d8cebd..5112b04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f95cc7d7f5290157a23216391dec610d bison-2.4.tar.bz2 +84e80a2a192c1a4c02d43fbf2bcc4ca4 bison-2.4.1.tar.bz2 From dfa03d7b40199b1e207354311ffd64503423a155 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sun, 28 Dec 2008 18:05:21 +0000 Subject: [PATCH 26/32] Drop obsolet 2.3 signature. --- bison-2.3.tar.bz2.sig | Bin 65 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bison-2.3.tar.bz2.sig diff --git a/bison-2.3.tar.bz2.sig b/bison-2.3.tar.bz2.sig deleted file mode 100644 index cdd10e6ac2139a0abe220e87e8e28bd26dfd7b93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-M1$i0xj$gWwZzU75dt{(0H030sP&<^W~s)zT(r6*Yuf3DP>%qd X2+}w#x(6d3-?PLUW({)Hx@G|b_39oD From 1f39a128446c5876b361aa6929766fd4a764a09e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 04:48:24 +0000 Subject: [PATCH 27/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index 4fa97f7..a881fdf 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator Name: bison Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -115,6 +115,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Dec 28 2008 Petr Machata - 2.4.1-1 - Rebase to 2.4.1 - Resolves: #478348 From bf8a0c0eac548c4dd658806d6559663d1c921c32 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 18:05:29 +0000 Subject: [PATCH 28/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- bison.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bison.spec b/bison.spec index a881fdf..9e67045 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator Name: bison Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -115,6 +115,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 2.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 6ac195f36c1f9fb9c992216608a6bbc3ecfc0641 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 24 Aug 2009 12:11:09 +0000 Subject: [PATCH 29/32] - Fix installation with --excludedocs - Resolves: #515939 --- bison.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bison.spec b/bison.spec index 9e67045..13afe7a 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator Name: bison Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 @@ -87,11 +87,15 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/yacc* gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info* %post -/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : +if [ -f %{_infodir}/bison.info.gz ]; then # for --excludedocs + /sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : +fi %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : + if [ -f %{_infodir}/bison.info.gz ]; then # for --excludedocs + /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : + fi fi # The distribution contains also source files. These are used by m4 @@ -115,6 +119,10 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 24 2009 Petr Machata - 2.4.1-4 +- Fix installation with --excludedocs +- Resolves: #515939 + * Fri Jul 24 2009 Fedora Release Engineering - 2.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 6666f880fb7e98dd96110ffd22a479e30f48a070 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 04:34:18 +0000 Subject: [PATCH 30/32] Initialize branch F-12 for bison --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From aa677bb4237c551a45407f62707ce5c2577423d0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:20:20 +0000 Subject: [PATCH 31/32] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9a22653..fdf79b1 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SPECFILE = $(firstword $(wildcard *.spec)) UPSTREAM_CHECKS = sig define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ef3b32f59a9530f9a6444c885845a5d061293b5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:01:28 +0000 Subject: [PATCH 32/32] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 24 ------------------------ branch | 1 - 3 files changed, 25 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fdf79b1..0000000 --- a/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Makefile for source rpm: bison -# $Id$ -NAME := bison -SPECFILE = $(firstword $(wildcard *.spec)) - -# Check the right flavor of signature file for ftp.gnu.org site. -UPSTREAM_CHECKS = sig - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12