rpms/flex/devel flex-2.5.33-opts.patch,1.1,1.2 flex.spec,1.38,1.39
Petr Machata (pmachata)
fedora-extras-commits at redhat.com
Fri May 11 15:50:14 UTC 2007
Author: pmachata
Update of /cvs/pkgs/rpms/flex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15651
Modified Files:
flex-2.5.33-opts.patch flex.spec
Log Message:
Fix in patch.
flex-2.5.33-opts.patch:
Index: flex-2.5.33-opts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex-2.5.33-opts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flex-2.5.33-opts.patch 11 May 2007 15:16:29 -0000 1.1
+++ flex-2.5.33-opts.patch 11 May 2007 15:49:39 -0000 1.2
@@ -1,6 +1,6 @@
diff -urp flex-2.5.33/scanopt.c flex-2.5.33-pm/scanopt.c
--- flex-2.5.33/scanopt.c 2002-08-29 22:30:25.000000000 +0200
-+++ flex-2.5.33-pm/scanopt.c 2007-05-11 17:03:01.000000000 +0200
++++ flex-2.5.33-pm/scanopt.c 2007-05-11 17:48:29.000000000 +0200
@@ -789,12 +789,12 @@ int scanopt (svoid, arg, optindex)
}
@@ -19,18 +19,20 @@
}
/* At this point, we have a long or short option matched at opt_offset into
-@@ -812,13 +812,10 @@ int scanopt (svoid, arg, optindex)
+@@ -812,13 +812,16 @@ int scanopt (svoid, arg, optindex)
/* case: no args allowed */
if (auxp->flags & ARG_NONE) {
- if (optarg) {
-- scanopt_err (s, opt_offset, is_short, errcode =
-- SCANOPT_ERR_ARG_NOT_ALLOWED);
-+ if (!optarg)
++ if (optarg && !is_short) {
+ scanopt_err (s, opt_offset, is_short, errcode =
+ SCANOPT_ERR_ARG_NOT_ALLOWED);
INC_INDEX (s, 1);
-- return errcode;
-- }
+ return errcode;
+ }
- INC_INDEX (s, 1);
++ else if (!optarg)
++ INC_INDEX (s, 1);
+ else
+ s->subscript++;
return optp->r_val;
Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- flex.spec 11 May 2007 15:16:29 -0000 1.38
+++ flex.spec 11 May 2007 15:49:39 -0000 1.39
@@ -1,7 +1,7 @@
Summary: A tool for creating scanners (text pattern recognizers)
Name: flex
Version: 2.5.33
-Release: 6%{?dist}
+Release: 7%{?dist}
License: BSD
Group: Development/Tools
URL: http://flex.sourceforge.net/
@@ -80,7 +80,7 @@
%{_infodir}/flex.info*
%changelog
-* Fri May 11 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-6
+* Fri May 11 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-7
- Allow joining short options into one commandline argument.
- Resolves: #239695
More information about the fedora-extras-commits
mailing list