Update to 2.6.4

diff --git a/Makefile.am b/Makefile.am
index eb68d2f1c78d67fadd152952d26875f189608a6e..638c54964f01cf781db6d756993925a7b45ef3c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,8 +42,8 @@ EXTRA_DIST = \
        autogen.sh
 
 SUBDIRS = \
-       lib \
-       . \
+       src \
+       doc \
        examples \
        po \
        tests \

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
deleted file mode 100644 (file)
index b03c40c..0000000
--- a/packaging/baselibs.conf
+++ /dev/null
@@ -1 +0,0 @@
-flex

diff --git a/packaging/flex.spec b/packaging/flex.spec
index 7c33f85ef6a2fa6f80db7bd2079b8cafa5bec1be..3b0edfb7e495bf1be0d922b656d6b6f98c473cfa 100644 (file)
--- a/packaging/flex.spec
+++ b/packaging/flex.spec
@@ -1,14 +1,12 @@
 %define keepstatic 1
 Name:           flex
-Version:        2.5.37
+Version:        2.6.4
 Release:        0
 License:        BSD-3-Clause
 Summary:        Fast Lexical Analyzer Generator
 Url:            http://flex.sourceforge.net/
 Group:          Development/Languages/C and C++
 Source:         %{name}-%{version}.tar.bz2
-Source1:        lex-wrapper.sh
-Source3:        baselibs.conf
 Source1001:    flex.manifest
 BuildRequires:  automake
 BuildRequires:  makeinfo
@@ -26,26 +24,21 @@ patterns in text.
 cp %{SOURCE1001} .
 
 %build
-autoreconf -fi
-%configure --disable-nls
-make %{?_smp_mflags}
+%reconfigure --disable-nls --disable-shared
+%{__make} %{?_smp_mflags}
 
 %check
-%if !0%{?qemu_user_space_build:1}
-make check
-%endif
+%{__make} %{?_smp_mflags} check
 
 %install
 %make_install
-install %{SOURCE1}  %{buildroot}/%{_bindir}/lex
 
 %remove_docs
 %files
 %manifest %{name}.manifest
 %license COPYING
 %defattr(-,root,root)
-/usr/bin/flex
-/usr/bin/flex++
-/usr/bin/lex
-/usr/include/FlexLexer.h
+%{_bindir}/flex
+%{_bindir}/flex++
+%{_includedir}/FlexLexer.h
 %{_libdir}/libfl.a

diff --git a/packaging/lex-wrapper.sh b/packaging/lex-wrapper.sh
deleted file mode 100644 (file)
index 7051b86..0000000
--- a/packaging/lex-wrapper.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/flex -l "$@"