rpms/flex/devel flex-2.5.33-test-linedir-r.patch, NONE, 1.1 flex.spec, 1.42, 1.43

[Petr Machata (pmachata)]

Author: pmachata

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

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.33-test-linedir-r.patch 
Log Message:
* Thu Aug 30 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-11
- Add BR gawk
- Fix use of awk in one of the tests


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

--- NEW FILE flex-2.5.33-test-linedir-r.patch ---
diff -rup flex-2.5.33/tests/test-linedir-r/Makefile.am flex-2.5.33-pm/tests/test-linedir-r/Makefile.am
--- flex-2.5.33/tests/test-linedir-r/Makefile.am	2003-03-26 19:29:45.000000000 +0100
+++ flex-2.5.33-pm/tests/test-linedir-r/Makefile.am	2007-08-30 12:28:09.000000000 +0200
@@ -46,8 +46,8 @@ $(testname)$(EXEEXT): $(OBJS)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
-	cat -n scanner.c | grep '#line' | grep scanner.c | awk -f $(srcdir)/check-lines.awk
-	cat -n scanner.h | grep '#line' | grep scanner.h | awk -f $(srcdir)/check-lines.awk
+	cat -n scanner.c | grep '#line' | grep scanner.c | $(AWK) -f $(srcdir)/check-lines.awk
+	cat -n scanner.h | grep '#line' | grep scanner.h | $(AWK) -f $(srcdir)/check-lines.awk
 
 .c.o:
 	$(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- flex.spec	29 Aug 2007 05:25:57 -0000	1.42
+++ flex.spec	30 Aug 2007 11:52:25 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.33
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -10,9 +10,10 @@
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
-BuildRequires: gettext bison m4
+BuildRequires: gettext bison m4 gawk
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -36,6 +37,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -82,6 +84,10 @@
 %{_infodir}/flex.info*
 
 %changelog
+* Thu Aug 30 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-11
+- Add BR gawk
+- Fix use of awk in one of the tests
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.5.33-10
 - Rebuild for selinux ppc32 issue.