From 9829cc0a31e6b776f01af13694dbab087e09ec0a Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Apr 13 2015 15:27:39 +0000
Subject: Resolves: #1064735

- Rebase to flex-2.5.39

---

diff --git a/.gitignore b/.gitignore
index 9fe5f19..2fe7db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ flex-2.5.35.tar.bz2
 *.rpm
 /flex-2.5.36.tar.bz2
 /flex-2.5.37.tar.bz2
+/flex-2.5.39.tar.bz2
diff --git a/flex.spec b/flex.spec
index 4cd5917..75e5c02 100644
--- a/flex.spec
+++ b/flex.spec
@@ -2,8 +2,8 @@
 
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
-Version: 2.5.37
-Release: 8%{?dist}
+Version: 2.5.39
+Release: 1%{?dist}
 # parse.c and parse.h are under GPLv3+ with exception which allows
 #	relicensing.  Since flex is shipped under BDS-style license,
 #	let's  assume that the relicensing was done.
@@ -13,17 +13,8 @@ Group: Development/Tools
 URL: http://flex.sourceforge.net/
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
-# https://sourceforge.net/tracker/?func=detail&aid=3546447&group_id=97492&atid=618177
-Patch0: flex-2.5.36-bison-2.6.1.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=925801
-Patch1: flex-2.5.37-aarch64.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=993447
-Patch2: flex-2.5.37-types.patch
-
 #fix test-bison-yylloc and test-bison-yylval test failures
-Patch3: 0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
+Patch0: 0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
@@ -71,9 +62,6 @@ plain text and PDF formats.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -84,6 +72,15 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO}
+# For now, excluding the new .la and .so files as we haven't had
+# any requests for them and adding them will require a new subpackage.
+# The .so files contain 2 optional implementations of main and yywrap
+# for developer convenience. They are also available in the .a file
+# provided in flex-devel.
+find %{buildroot} -name '*.la' -delete
+find %{buildroot} -name '*.so' -delete
+find %{buildroot} -name '*.so.2' -delete
+find %{buildroot} -name '*.so.2.0.0' -delete
 
 ( cd ${RPM_BUILD_ROOT}
   ln -sf flex .%{_bindir}/lex
@@ -137,6 +134,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_pkgdocdir}
 
 %changelog
+* Mon Apr 13 2015 Patsy Franklin <pfrankli@redhat.com> - 2.5.39-1
+- Rebase to 2.5.39
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.37-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index fd70a98..ec61826 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c75940e1fc25108f2a7b3ef42abdae06  flex-2.5.37.tar.bz2
+77d44c6bb8c0705e0017ab9a84a1502b  flex-2.5.39.tar.bz2