diff --git a/linuxdoc-tools-0.9.20-lib64.patch b/linuxdoc-tools-0.9.20-lib64.patch index 66ff2a3..4e13616 100644 --- a/linuxdoc-tools-0.9.20-lib64.patch +++ b/linuxdoc-tools-0.9.20-lib64.patch @@ -1,7 +1,7 @@ --- linuxdoc-tools-0.9.60/bin/linuxdoc.in.orig +++ linuxdoc-tools-0.9.60/bin/linuxdoc.in @@ -23,6 +23,7 @@ - $AuxBinDir = "@auxbindir@"; + $AuxBinDir = "@auxbindir@"; use lib "@pkgdatadir@"; +use lib "@prefix@/lib64/perl5"; diff --git a/linuxdoc-tools-0.9.68-flex.patch b/linuxdoc-tools-0.9.68-flex.patch deleted file mode 100644 index ba3da2e..0000000 --- a/linuxdoc-tools-0.9.68-flex.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 52c51f0..9d0737a 100644 --- a/linuxdoc-tools.spec +++ b/linuxdoc-tools.spec @@ -4,16 +4,14 @@ Summary: A text formatting package based on SGML Name: linuxdoc-tools -Version: 0.9.68 -Release: 11%{?dist} +Version: 0.9.72 +Release: 1%{?dist} License: Copyright only Group: Applications/Publishing -Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz +Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.orig.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 #need actual perl directory structure BuildRequires: perl >= 4:5.10.1 @@ -42,14 +40,15 @@ documentation. %setup -q %patch0 -p1 %patch1 -p1 -b .lib64 -%patch2 -p1 %build -%configure --with-installed-iso-entities +#need to get config.{sub,guess} in, something is broken in the build +autoreconf +%configure --with-installed-nsgmls --with-installed-iso-entities --disable-docs # Packaging brain-damage pushd entity-map autoconf -%configure +%configure --enable-docs pdf popd make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -107,6 +106,12 @@ exit 0 %{_mandir}/*/* %changelog +* Mon Jun 19 2017 Ondrej Vasik - 0.9.72-1 +- new version 0.9.72, temporarily disable docs builds + +* Fri Jun 16 2017 Troy Dawson - 0.9.68-12 +- Flex patch (Patch2) no longer needed (#1423895) + * Fri Feb 10 2017 Fedora Release Engineering - 0.9.68-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild