dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-bison-2.0.tar.gz

.gitignore

@@ -0,0 +1,2 @@
+bison-2.4.tar.bz2
+bison-2.4.1.tar.bz2

Makefile

@@ -1,6 +0,0 @@
-# Makefile for source rpm: bison
-# $Id$
-NAME := bison
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common

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 ();

bison.spec

@@ -1,15 +1,17 @@
-Summary: A GNU general-purpose parser generator.
+Summary: A GNU general-purpose parser generator
 Name: bison
-Version: 2.0
-Release: 4
-License: GPL
+Version: 2.4.1
+Release: 2%{?dist}
+License: GPLv2+
 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
-Url: http://www.gnu.org/software/bison/
-Prereq: /sbin/install-info
+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 java-1.6.0-openjdk-devel
 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
@@ -34,16 +36,42 @@ 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.
 
+# -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
+
+%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.  See the Internationalization in the
+Bison manual section for more information.
+
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
 make
 
+%check
+make check
+#make maintainer-check
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -51,26 +79,33 @@ 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
 
 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
 
+# 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 REFERENCES THANKS TODO doc/FAQ
+%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO
 %{_mandir}/*/bison*
 %{_datadir}/bison
 %{_infodir}/bison.info*
 %{_bindir}/bison
+%{_datadir}/aclocal/bison*.m4
+
+%files -f %{name}-runtime.lang runtime
 
 %files devel
 %defattr(-,root,root)
@@ -80,11 +115,72 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 28 2008 Petr Machata <pmachata@redhat.com> - 2.4.1-1
+- Rebase to 2.4.1
+- Resolves: #478348
+
+* Wed Nov 12 2008 Petr Machata <pmachata@redhat.com> - 2.4-2
+- Rebase to 2.4
+- Resolves: #471183
+
+* Mon Sep 15 2008 Petr Machata <pmachata@redhat.com> - 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 <rel-eng@fedoraproject.org> - 2.3-5
+- Autorebuild for GCC 4.3
+
+* Tue Aug 28 2007 Roland McGrath <roland@redhat.com> - 2.3-4
+- Canonicalize License tag.
+
+* Sun Jan 21 2007 Roland McGrath <roland@redhat.com> - 2.3-3
+- Canonicalize post/preun use of install-info.
+- Resolves: 223679
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.3-2.1
+- rebuild
+
+* Wed Jun  7 2006 Roland McGrath <roland@redhat.com> - 2.3-2
+- Add BuildRequires on m4.
+
+* Wed Jun  7 2006 Roland McGrath <roland@redhat.com> - 2.3-1
+- New upstream version 2.3
+
+* Mon May 22 2006 Roland McGrath <roland@redhat.com> - 2.2-1
+- New upstream version 2.2
+
+* Mon May  1 2006 Roland McGrath <roland@redhat.com> - 2.1-3
+- Fix K&R parser definition when it has no arguments (#190376).
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Fri Oct 14 2005 Roland McGrath <roland@redhat.com> - 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 <roland@redhat.com> - 2.0-6
+- run test suite in %%check
+
+* Mon Mar 14 2005 Roland McGrath <roland@redhat.com> - 2.0-5
+- rebuilt
+
 * Thu Jan  6 2005 Roland McGrath <roland@redhat.com> - 2.0-4
 - update upstream URLs, add doc files (#144346)
 
 * Thu Jan  6 2005 Roland McGrath <roland@redhat.com> - 2.0-3
-- missing %defattr for subpackage
+- missing %%defattr for subpackage
 
 * Thu Jan  6 2005 Roland McGrath <roland@redhat.com> - 2.0-2
 - split liby.a into bison-devel package

mirrors

@@ -0,0 +1 @@
+http://ftp.gnu.org/gnu/bison

sources

@@ -1 +1 @@
-c17f964fd5504b88b07a183420de25e3  bison-2.0.tar.gz
+84e80a2a192c1a4c02d43fbf2bcc4ca4  bison-2.4.1.tar.bz2

upstream

@@ -0,0 +1 @@
+bison-2.3.tar.bz2

upstream-key.gpg

@@ -0,0 +1,48 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.1 (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+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-----