From a5daacb7bdde9eeadd10bd6ca158cce9e7d50e7f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 27 Feb 2008 17:27:56 +0000 Subject: [PATCH] - Rebase to 2.5.35. Drop two patches. - Resolves: #434961 - Resolves: #435047 --- .cvsignore | 2 +- flex-2.5.33-prototypes.patch | 19 ----- flex-2.5.34-testsuite.patch | 131 ----------------------------------- flex.spec | 11 +-- sources | 2 +- 5 files changed, 8 insertions(+), 157 deletions(-) delete mode 100644 flex-2.5.33-prototypes.patch delete mode 100644 flex-2.5.34-testsuite.patch diff --git a/.cvsignore b/.cvsignore index a2773e7..4f868b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -flex-2.5.34.tar.bz2 +flex-2.5.35.tar.bz2 diff --git a/flex-2.5.33-prototypes.patch b/flex-2.5.33-prototypes.patch deleted file mode 100644 index 17c7021..0000000 --- a/flex-2.5.33-prototypes.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- flex.skl 2008/02/09 15:49:48 2.211 -+++ flex.skl 2008/02/09 18:54:56 2.212 -@@ -889,6 +889,8 @@ - - %endif - -+%endif End reentrant structures and macros. -+ - /* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -@@ -978,7 +980,6 @@ - ]]) - ]]) - %endif --%endif End reentrant structures and macros. - - /* Macros after this point can all be overridden by user definitions in - * section 1. diff --git a/flex-2.5.34-testsuite.patch b/flex-2.5.34-testsuite.patch deleted file mode 100644 index 4e1e5b3..0000000 --- a/flex-2.5.34-testsuite.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -urp flex-2.5.34/tests/test-alloc-extra/scanner.l flex-2.5.34-pm/tests/test-alloc-extra/scanner.l ---- flex-2.5.34/tests/test-alloc-extra/scanner.l 2007-09-10 08:17:45.000000000 +0200 -+++ flex-2.5.34-pm/tests/test-alloc-extra/scanner.l 2008-02-25 18:09:14.000000000 +0100 -@@ -44,7 +44,7 @@ struct Check { - static void check_extra ( yyscan_t scanner ); - - /* Special yyalloc */ --void *yyalloc ( size_t size, yyscan_t scanner ); -+void *yyalloc ( yy_size_t size, yyscan_t scanner ); - - %} - -@@ -60,7 +60,7 @@ - return 0; - } - --void *yyalloc(size_t size, yyscan_t scanner) -+void *yyalloc(yy_size_t size, yyscan_t scanner) - { - struct Check *check; - check = testget_extra(scanner); -diff -urp flex-2.5.34/tests/test-c++-multiple-scanners/scanner-1.l flex-2.5.34-pm/tests/test-c++-multiple-scanners/scanner-1.l ---- flex-2.5.34/tests/test-c++-multiple-scanners/scanner-1.l 2002-10-01 17:10:12.000000000 +0200 -+++ flex-2.5.34-pm/tests/test-c++-multiple-scanners/scanner-1.l 2008-02-25 16:54:48.000000000 +0100 -@@ -1,23 +1,25 @@ -- // This file is part of flex. -- // -- // Redistribution and use in source and binary forms, with or without -- // modification, are permitted provided that the following conditions -- // are met: -- // -- // 1. Redistributions of source code must retain the above copyright -- // notice, this list of conditions and the following disclaimer. -- // 2. Redistributions in binary form must reproduce the above copyright -- // notice, this list of conditions and the following disclaimer in the -- // documentation and/or other materials provided with the distribution. -- // -- // Neither the name of the University nor the names of its contributors -- // may be used to endorse or promote products derived from this software -- // without specific prior written permission. -- // -- // THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -- // IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -- // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- // PURPOSE. -+/* -+ * This file is part of flex. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE. -+ */ - - %{ - #include "config.h" -diff -urp flex-2.5.34/tests/test-c++-multiple-scanners/scanner-2.l flex-2.5.34-pm/tests/test-c++-multiple-scanners/scanner-2.l ---- flex-2.5.34/tests/test-c++-multiple-scanners/scanner-2.l 2006-10-23 00:17:38.000000000 +0200 -+++ flex-2.5.34-pm/tests/test-c++-multiple-scanners/scanner-2.l 2008-02-25 16:55:00.000000000 +0100 -@@ -1,23 +1,25 @@ -- // This file is part of flex. -- // -- // Redistribution and use in source and binary forms, with or without -- // modification, are permitted provided that the following conditions -- // are met: -- // -- // 1. Redistributions of source code must retain the above copyright -- // notice, this list of conditions and the following disclaimer. -- // 2. Redistributions in binary form must reproduce the above copyright -- // notice, this list of conditions and the following disclaimer in the -- // documentation and/or other materials provided with the distribution. -- // -- // Neither the name of the University nor the names of its contributors -- // may be used to endorse or promote products derived from this software -- // without specific prior written permission. -- // -- // THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -- // IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -- // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- // PURPOSE. -+/* -+ * This file is part of flex. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE. -+ */ - - %{ - #include "config.h" -diff -urp flex-2.5.34/tests/test-pthread/scanner.l flex-2.5.34-pm/tests/test-pthread/scanner.l ---- flex-2.5.34/tests/test-pthread/scanner.l 2007-05-12 17:27:33.000000000 +0200 -+++ flex-2.5.34-pm/tests/test-pthread/scanner.l 2008-02-25 17:02:03.000000000 +0100 -@@ -52,7 +52,7 @@ static int process_text(char* s, yyscan_ - %option reentrant - %option warn - -- /* Arbitrary states.*/ -+/* Arbitrary states.*/ - %x STATE_1 - %x STATE_2 - diff --git a/flex.spec b/flex.spec index 1571d56..3fb3f37 100644 --- a/flex.spec +++ b/flex.spec @@ -1,13 +1,11 @@ Summary: A tool for creating scanners (text pattern recognizers) Name: flex -Version: 2.5.34 +Version: 2.5.35 Release: 1%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ Source: flex-%{version}.tar.bz2 -Patch0: flex-2.5.33-prototypes.patch -Patch1: flex-2.5.34-testsuite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: m4 BuildRequires: gettext bison m4 @@ -30,8 +28,6 @@ application development. %prep %setup -q -%patch0 -p0 -%patch1 -p1 %build %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS" @@ -78,6 +74,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_infodir}/flex.info* %changelog +* Wed Feb 27 2008 Petr Machata - 2.5.35-1 +- Rebase to 2.5.35. Drop two patches. +- Resolves: #434961 +- Resolves: #435047 + * Mon Feb 25 2008 Petr Machata - 2.5.34-1 - Rebase to 2.5.34. Drop five patches. - Resolves: #434676 diff --git a/sources b/sources index d8363e7..c7265cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbdabda79de417b863970eb03c0f53a3 flex-2.5.34.tar.bz2 +10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2