[linuxdoc-tools] fix build with newer flex versions

Martin Milata mmilata at fedoraproject.org
Tue Feb 19 10:32:55 UTC 2013


commit cf646c7be8ebc05b8a0e358b1be6f9a15d9d95ec
Author: Martin Milata <mmilata at redhat.com>
Date:   Tue Feb 19 11:20:27 2013 +0100

    fix build with newer flex versions

 linuxdoc-tools-0.9.68-flex.patch |   17 +++++++++++++++++
 linuxdoc-tools.spec              |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/linuxdoc-tools-0.9.68-flex.patch b/linuxdoc-tools-0.9.68-flex.patch
new file mode 100644
index 0000000..ba3da2e
--- /dev/null
+++ b/linuxdoc-tools-0.9.68-flex.patch
@@ -0,0 +1,17 @@
+--- linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l	2008-05-28 18:16:36.000000000 +0200
++++ linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l-patched	2013-02-19 11:10:25.367016000 +0100
+@@ -72,7 +72,14 @@
+ int skipnewline = 0;
+ 
+ extern char *yytext;
++
++#if   YY_FLEX_MAJOR_VERSION > 2 \
++ ||  (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 5) \
++ ||  (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35)
++extern yy_size_t yyleng;
++#else
+ extern int yyleng;
++#endif
+ 
+ #define CHAPTER 1
+ #define SECTION 2
diff --git a/linuxdoc-tools.spec b/linuxdoc-tools.spec
index 087ff91..3c8535a 100644
--- a/linuxdoc-tools.spec
+++ b/linuxdoc-tools.spec
@@ -4,12 +4,13 @@
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.68
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
 Patch0: linuxdoc-tools-0.9.13-letter.patch
 Patch1: linuxdoc-tools-0.9.20-lib64.patch
+Patch2: linuxdoc-tools-0.9.68-flex.patch
 Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex flex-static sgml-common jade gawk groff autoconf texinfo
@@ -39,6 +40,7 @@ documentation.
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .lib64
+%patch2 -p1
 
 %build
 %configure --with-installed-iso-entities
@@ -102,6 +104,9 @@ exit 0
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 19 2013 Martin Milata <mmilata at redhat.com> - 0.9.68-3
+- fix build with newer flex versions
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.68-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list