rpms/flex/devel flex-2.5.35-missing-prototypes.patch, 1.1, 1.2 flex.spec, 1.63, 1.64

Petr Machata pmachata at fedoraproject.org
Wed Jul 14 11:24:13 UTC 2010


Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12586

Modified Files:
	flex-2.5.35-missing-prototypes.patch flex.spec 
Log Message:
- Forgot that the changes in flex.skl won't propagate to skel.c
- Resolves: #612465


flex-2.5.35-missing-prototypes.patch:
 flex.skl |   16 ++++++++++++++++
 skel.c   |   16 ++++++++++++++++
 2 files changed, 32 insertions(+)

Index: flex-2.5.35-missing-prototypes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex-2.5.35-missing-prototypes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- flex-2.5.35-missing-prototypes.patch	13 Jul 2010 15:57:53 -0000	1.1
+++ flex-2.5.35-missing-prototypes.patch	14 Jul 2010 11:24:13 -0000	1.2
@@ -26,3 +26,28 @@ diff -up flex-2.5.35/flex.skl\~ flex-2.5
  [[
 
 Diff finished.  Tue Jul 13 17:27:50 2010
+--- flex-2.5.35/skel.c~	2010-07-14 13:15:42.000000000 +0200
++++ flex-2.5.35/skel.c	2010-07-14 13:16:05.000000000 +0200
+@@ -1027,6 +1027,22 @@
+   "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
+   "]])",
+   "",
++  "m4_ifdef( [[M4_YY_REENTRANT]],",
++  "[[",
++  "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
++  "[[",
++  "int yyget_column  M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
++  "]])",
++  "]])",
++  "",
++  "m4_ifdef( [[M4_YY_REENTRANT]],",
++  "[[",
++  "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
++  "[[",
++  "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
++  "]])",
++  "]])",
++  "",
+   "%if-bison-bridge",
+   "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
+   "[[",


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- flex.spec	13 Jul 2010 15:57:53 -0000	1.63
+++ flex.spec	14 Jul 2010 11:24:13 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -109,6 +109,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 14 2010 Petr Machata <pmachata at redhat.com> - 2.5.35-11
+- Forgot that the changes in flex.skl won't propagate to skel.c
+- Resolves: #612465
+
 * Tue Jul 13 2010 Petr Machata <pmachata at redhat.com> - 2.5.35-10
 - Declare yyget_column and yyset_column in reentrant mode.
 - Resolves: #612465



More information about the scm-commits mailing list