rpms/flex/F-7 flex-2.5.33-includedir.patch, NONE, 1.1 flex.spec, 1.40, 1.41

[Petr Machata (pmachata)]

Author: pmachata

Update of /cvs/pkgs/rpms/flex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29346

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.33-includedir.patch 
Log Message:
- Remove wrong use of @includedir@ in Makefile.in.
- Spec cleanups.
- Resolves: #225758


flex-2.5.33-includedir.patch:

--- NEW FILE flex-2.5.33-includedir.patch ---
diff -urp flex-2.5.33/Makefile.in flex-2.5.33-pm/Makefile.in
--- flex-2.5.33/Makefile.in	2007-05-30 10:57:18.000000000 +0200
+++ flex-2.5.33-pm/Makefile.in	2007-05-30 10:57:11.000000000 +0200
@@ -291,7 +291,7 @@ SUBDIRS = \
 
 
 localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I at includedir@ -I$(top_srcdir)/intl
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
 AM_CFLAGS = -fPIC
 
 # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/F-7/flex.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- flex.spec	22 Jun 2007 10:56:41 -0000	1.40
+++ flex.spec	25 Jun 2007 14:29:39 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.33
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -9,9 +9,10 @@
 Patch0: flex-2.5.33-pic.patch
 Patch1: flex-2.5.33-yy.patch
 Patch2: flex-2.5.33-opts.patch
+Patch3: flex-2.5.33-includedir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
-BuildRequires: gettext info bison m4
+BuildRequires: gettext bison m4
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -34,10 +35,11 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-dependency-tracking
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +82,11 @@
 %{_infodir}/flex.info*
 
 %changelog
+* Fri Jun 22 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-9
+- Remove wrong use of @includedir@ in Makefile.in.
+- Spec cleanups.
+- Resolves: #225758
+
 * Fri Jun 22 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-8
 - Don't emit yy-prefixed variables in C++ mode.  Thanks Srinivas Aji.
 - Resolves: #242742