rpms/flex/devel flex-2.5.34-testsuite.patch, NONE, 1.1 flex.spec, 1.52, 1.53 flex-2.5.33-includedir.patch, 1.2, NONE flex-2.5.33-opts.patch, 1.2, NONE flex-2.5.33-signedwarn.patch, 1.1, NONE flex-2.5.33-test-linedir-r.patch, 1.2, NONE flex-2.5.33-yy.patch, 1.2, NONE

Mon Feb 25 17:30:21 UTC 2008

Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17012

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.34-testsuite.patch 
Removed Files:
	flex-2.5.33-includedir.patch flex-2.5.33-opts.patch 
	flex-2.5.33-signedwarn.patch flex-2.5.33-test-linedir-r.patch 
	flex-2.5.33-yy.patch 
Log Message:
- Rebase to 2.5.34. Drop five patches.
- Resolves: #434676


flex-2.5.34-testsuite.patch:

--- NEW FILE flex-2.5.34-testsuite.patch ---
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
 


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- flex.spec	11 Feb 2008 12:24:05 -0000	1.52
+++ flex.spec	25 Feb 2008 17:29:44 -0000	1.53
@@ -1,17 +1,13 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
-Version: 2.5.33
-Release: 17%{?dist}
+Version: 2.5.34
+Release: 1%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
 Source: flex-%{version}.tar.bz2
-Patch1: flex-2.5.33-yy.patch
-Patch2: flex-2.5.33-opts.patch
-Patch3: flex-2.5.33-includedir.patch
-Patch4: flex-2.5.33-test-linedir-r.patch
-Patch5: flex-2.5.33-signedwarn.patch
-Patch6: flex-2.5.33-prototypes.patch
+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
@@ -34,12 +30,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
 
 %build
 %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -86,6 +78,10 @@
 %{_infodir}/flex.info*
 
 %changelog
+* Mon Feb 25 2008 Petr Machata <pmachata at redhat.com> - 2.5.34-1
+- Rebase to 2.5.34. Drop five patches.
+- Resolves: #434676
+
 * Mon Feb 11 2008 Petr Machata <pmachata at redhat.com> - 2.5.33-17
 - Generate prototypes for accessor functions.  Upstream patch.
 - Related: #432203


--- flex-2.5.33-includedir.patch DELETED ---


--- flex-2.5.33-opts.patch DELETED ---


--- flex-2.5.33-signedwarn.patch DELETED ---


--- flex-2.5.33-test-linedir-r.patch DELETED ---


--- flex-2.5.33-yy.patch DELETED ---


