diff --git a/flex-2.5.34-g++44.diff b/flex-2.5.34-g++44.diff new file mode 100644 index 0000000..aa207a2 --- /dev/null +++ b/flex-2.5.34-g++44.diff @@ -0,0 +1,12 @@ +Index: skel.c +=================================================================== +--- skel.c 2008-02-26 22:34:19.000000000 +0100 ++++ skel.c 2009-01-12 11:29:26.000000000 +0100 +@@ -286,6 +286,7 @@ const char *skel[] = { + "#include ", + "#include ", + "#include ", ++ "#include ", + "/* end standard C++ headers. */", + "%endif", + "", diff --git a/flex.changes b/flex.changes index 995ff92..52725d8 100644 --- a/flex.changes +++ b/flex.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 12 11:35:11 CET 2009 - rguenther@suse.de + +- Add patch to include in the C++ header section. Fixes + the C++ parts of the testsuite with GCC 4.4. + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/flex.spec b/flex.spec index e08e960..dcf6696 100644 --- a/flex.spec +++ b/flex.spec @@ -1,7 +1,7 @@ # # spec file for package flex (Version 2.5.35) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -32,7 +32,7 @@ Obsoletes: flex-64bit %endif # Version: 2.5.35 -Release: 43 +Release: 44 Summary: Fast Lexical Analyzer Generator Source: %{name}-%{version}.tar.bz2 Source1: lex-wrapper.sh @@ -40,6 +40,7 @@ Source2: README.SUSE Patch1: flex-2.5.34-fPIC.patch Patch2: flex-2.5.33-yylineno.patch Patch3: flex-2.5.34-doc-fix.diff +Patch4: flex-2.5.34-g++44.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +62,7 @@ Authors: # all scanners. Let's see if the failing packages got fixed in the meantime. #patch2 %patch3 +%patch4 cp %{S:2} . %build @@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog +* Mon Jan 12 2009 rguenther@suse.de +- Add patch to include in the C++ header section. Fixes + the C++ parts of the testsuite with GCC 4.4. * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293)