diff --git a/bison-2.3.tar.bz2 b/bison-2.3.tar.bz2 deleted file mode 100644 index ed597c8..0000000 --- a/bison-2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb -size 1080319 diff --git a/bison-2.4.1-28169bab1f6f2fc b/bison-2.4.1-28169bab1f6f2fc new file mode 100644 index 0000000..d5d1dc5 --- /dev/null +++ b/bison-2.4.1-28169bab1f6f2fc @@ -0,0 +1,34 @@ +From 28169bab1f6f2fc9d682118703f6267c63583720 Mon Sep 17 00:00:00 2001 +From: Akim Demaille +Date: Wed, 12 Aug 2009 14:18:12 +0000 +Subject: tests: GCC 4.5 compliance. + + * tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust to GCC 4.5's + messages about #error. +--- +diff --git a/tests/synclines.at b/tests/synclines.at +index 8653b46..56efdac 100644 +--- a/tests/synclines.at ++++ b/tests/synclines.at +@@ -34,7 +34,18 @@ m4_define([AT_SYNCLINES_COMPILE], + # => + # input.y:4: #error "4" + # +-AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' stderr]], 0, [stdout]) ++# It may also issue more context information: ++# ++# input.y: In function 'yyparse': ++# input.y:8: #error "8" ++# => ++# input.y:4: #error "8" ++# ++AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' \ ++ -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' \ ++ -e "/^[^:]*: In function '[^\']*':$/d" \ ++ stderr]], ++ 0, [stdout]) + ]) + + # AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG) +-- +cgit v0.8.2.1 diff --git a/bison-2.4.1-7439c5c0f949408 b/bison-2.4.1-7439c5c0f949408 new file mode 100644 index 0000000..cfffdea --- /dev/null +++ b/bison-2.4.1-7439c5c0f949408 @@ -0,0 +1,33 @@ +From 7439c5c0f94940884e998c06b910476c6f6145b5 Mon Sep 17 00:00:00 2001 +From: Joel E. Denny +Date: Mon, 05 Oct 2009 02:59:18 +0000 +Subject: tests: skip tests of file names that platform does not support. + +Reported by Michael Raskin at +. +* THANKS (Michael Raskin): Add. +* tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Fix. Cygwin used +to fail at least for file names containing ":" or "\". +(cherry picked from commit 2ceb8c617cac934b45f101ab44508d72239c894b) + +Conflicts: + + THANKS +--- +diff --git a/tests/output.at b/tests/output.at +index 971df1e..31298d7 100644 +--- a/tests/output.at ++++ b/tests/output.at +@@ -175,6 +175,10 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y], + m4_define([AT_CHECK_OUTPUT_FILE_NAME], + [AT_SETUP([Output file name: $1]) + ++# Skip if platform doesn't support file name. For example, Cygwin ++# doesn't support file names containing ":" or "\". ++AT_CHECK([[touch "]AS_ESCAPE([$1[.tmp]])[" || exit 77]]) ++ + AT_DATA_GRAMMAR([glr.y], + [[%glr-parser + %code { +-- +cgit v0.8.2.1 diff --git a/bison-2.4.1.tar.bz2 b/bison-2.4.1.tar.bz2 new file mode 100644 index 0000000..4c05cab --- /dev/null +++ b/bison-2.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2354469782149e36c644ae7c3e5105895424ed21cda5c05b591cb3dc17068e6b +size 1467784 diff --git a/bison.changes b/bison.changes index 633020e..68de097 100644 --- a/bison.changes +++ b/bison.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Wed Feb 10 16:57:10 CET 2010 - rguenther@suse.de + +- Update to version 2.4.1. +- Apply fix for GCC 4.5 compliance. +- Apply fix for unsupported output file names. + +------------------------------------------------------------------- +Mon Feb 8 10:59:57 UTC 2010 - coolo@novell.com + +- package yacc.1 too + +------------------------------------------------------------------- +Fri Jan 29 12:42:41 UTC 2010 - coolo@novell.com + +- fix patch name + +------------------------------------------------------------------- +Tue Jan 26 11:53:49 CET 2010 - mmarek@suse.cz + +- updated to 2.4 + * new experimental %language directive to select the used + skeleton and output file name + * experimantal Java parser support + * support for push parsers + * bison now removes unreachable states (this might require + updates to %expect and %expect-rr directives) + * support for per-type and default %destructor's and %printer's + * except for LALR(1) parsers in C with POSIX Yacc emulation enabled + (with `-y', `--yacc', or `%yacc'), Bison no longer generates + #define statements for associating token numbers with token + names + * For a detailed list of fixes and new features, see + /usr/share/doc/packages/bison/NEWS + +------------------------------------------------------------------- +Sat Dec 12 20:36:01 CET 2009 - jengelh@medozas.de + +- enable parallel building +- add baselibs.conf as a source + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/bison.spec b/bison.spec index e7f1caf..3b2d741 100644 --- a/bison.spec +++ b/bison.spec @@ -1,7 +1,7 @@ # -# spec file for package bison (Version 2.3) +# spec file for package bison (Version 2.4.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: bison BuildRequires: gcc-c++ -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/C and C++ PreReq: %install_info_prereq AutoReqProv: on @@ -30,28 +30,25 @@ Obsoletes: bison-64bit %endif # Requires: m4 -Version: 2.3 -Release: 127 +Version: 2.4.1 +Release: 1 Summary: The GNU Parser Generator Url: http://www.gnu.org/software/bison/bison.html Source: bison-%{version}.tar.bz2 -Patch1: bison-%{version}-subpipe.diff +Source2: baselibs.conf +Patch1: bison-2.3-subpipe.diff +Patch2: bison-2.4.1-28169bab1f6f2fc +Patch3: bison-2.4.1-7439c5c0f949408 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Bison is a parser generator similar to yacc(1). - - -Authors: --------- - David J. MacKenzie - Noah Friedman - Richard Stallman - %prep %setup -q %patch1 +%patch2 -p1 +%patch3 -p1 %build # CXXFLAGS is for c++ examples / test cases @@ -62,8 +59,8 @@ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} -make -make check +make %{_smp_mflags} +make %{_smp_mflags} check %install rm -rf $RPM_BUILD_ROOT @@ -86,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/aclocal/bison-i18n.m4 %doc %{_infodir}/bison.info*.gz %doc %{_mandir}/man1/bison.1.gz +%doc %{_mandir}/man1/yacc.1.gz %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -94,104 +92,3 @@ rm -rf $RPM_BUILD_ROOT %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog -* Wed Dec 10 2008 olh@suse.de -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) -* Thu Oct 30 2008 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Wed Jan 24 2007 mmarek@suse.cz -- use more $RPM_OPT_FLAGS -* Mon Jun 26 2006 mmarek@suse.cz -- updated to 2.3 - * all generated scanners can be used in non-free programs - (previously, only LALR(1) scanners in C had the exception) - * multiple %%union declarations can be used, they will be - concatenated - * unused values with a %%destructor are warned about - * %%destructors are not run for values in the action that called - YYABORT/YYACCEPT/YYERROR - * unsatisfied number of %%expect/%%expect-rr conflicts is an error, - not warning - * ability to depend on a minimal bison version via - %%require "VERSION" - * no global YYSTYPE and YYLTYPE macros and token names in C++ - scanners -- yy::parser::semantic_type, yy::parser::location_type - and yy::parser::token:: should be used instead - (can be reverted by '%%define "global_tokens_and_yystype" "1"') -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Dec 21 2005 mmarek@suse.cz -- push the 2.1 update into factory -* Thu Dec 15 2005 mmarek@suse.cz -- update to 2.1 -* Fri Nov 05 2004 tcrhak@suse.cz -- fixed wrong variable name (bug #47961, patch output) -* Mon Jan 26 2004 kukuk@suse.de -- Readd m4 requirement -* Sun Jan 11 2004 adrian@suse.de -- build as user -* Tue Jan 06 2004 tcrhak@suse.cz -- update to version 1.875 -- use %%{_libdir} -- run the testsuite -- applied Michael Matz's patch -- GCC does not support attributes on label in C++ -* Fri Sep 12 2003 tcrhak@suse.cz -- require m4, issue an error message and return a non-zero - exit code if m4 binary is not found [bug #30653], patch readpipe -* Thu Apr 24 2003 ro@suse.de -- fix install_info --delete call and move from preun to postun -* Fri Mar 07 2003 tcrhak@suse.cz -- Improved fix for the scaner: treat @ and initial comments - the right way -* Fri Feb 07 2003 ro@suse.de -- added install_info macros -* Sat Nov 09 2002 aj@suse.de -- Fix one more problem encountered in building gcc with $ - (all work done by jh@suse.cz). -* Sat Nov 09 2002 aj@suse.de -- Fix last patch to handle $ in comments correctly. -* Sat Nov 09 2002 aj@suse.de -- Fix handling of $ in scan-gram. -* Wed Nov 06 2002 tcrhak@suse.cz -- update to version 1.75 -- removed YYPARSE_RETURN_TYPE: no package uses this and yyparse() - relies on having its return type compatible with int -- do not use C++ kludges fix with the new version -* Tue Sep 17 2002 ro@suse.de -- removed bogus self-provides -* Tue Jul 23 2002 tcrhak@suse.cz -- a stack overflow fix for `C++ kludges': do extend stack - even if location tracking is not enabled -* Wed Jun 26 2002 tcrhak@suse.cz -- update to 1.35 -* Wed Feb 13 2002 schwab@suse.de -- Don't use NULL when it may not be defined. -* Fri Feb 08 2002 tcrhak@suse.cz -- update to version 1.33 -* Fri Jan 25 2002 tcrhak@suse.cz -- update to version 1.32 -* Tue Dec 11 2001 schwab@suse.de -- Fix double free. -* Fri Nov 30 2001 schwab@suse.de -- Fix use of YYSTACK_USE_ALLOCA in parser skeleton. -* Fri Nov 30 2001 tcrhak@suse.cz -- update to 1.30 -* Sun Dec 03 2000 schwab@suse.de -- Fix line numbers in bison.simple. -* Thu Aug 24 2000 nadvornik@suse.cz -- update to 1.28 -* Fri Jan 28 2000 schwab@suse.de -- Fix missing declaration -- Specfile cleanup, get rid of Makefile.Linux -- /usr/{info,man} -> /usr/share/{info,man} -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Fri Jun 13 1997 rj@suse.de -- yacc emulation removed, because of existing mid-age technology -* Fri May 16 1997 rj@suse.de -- version 1.25 - - yacc-functionality emulated thru script