diff --git a/latex2rtf-a4wide.patch b/latex2rtf-a4wide.patch new file mode 100644 index 0000000..c9636fc --- /dev/null +++ b/latex2rtf-a4wide.patch @@ -0,0 +1,23 @@ +diff -up latex2rtf-2.3.8/test/linux.tex.a4wide latex2rtf-2.3.8/test/linux.tex +--- latex2rtf-2.3.8/test/linux.tex.a4wide 2013-09-05 06:23:49.000000000 -0600 ++++ latex2rtf-2.3.8/test/linux.tex 2015-02-25 09:41:43.932328913 -0700 +@@ -1,6 +1,6 @@ + \documentclass[a4paper, notitlepage]{report} + \usepackage[latin1]{inputenc} % Accept european-encoded (latin1) characters. +-\usepackage{a4wide} % Wide paper -- W.Hennings: this is bad practice ++\usepackage{a4} % Wide paper -- W.Hennings: this is bad practice + \usepackage{url} + \urlstyle{sf} + % For Swedish reports +diff -up latex2rtf-2.3.8/test/misc4.tex.a4wide latex2rtf-2.3.8/test/misc4.tex +--- latex2rtf-2.3.8/test/misc4.tex.a4wide 2013-09-05 06:23:49.000000000 -0600 ++++ latex2rtf-2.3.8/test/misc4.tex 2015-02-25 09:41:32.812393332 -0700 +@@ -3,7 +3,7 @@ + % written in \LaTeX + % with the NFSS, but should work with normal \LaTeX + +-\documentstyle[12pt,a4wide]{report} ++\documentstyle[12pt,a4]{report} + + \newcommand{\contact}{Gavin Maltby (Maths Department, UNP)} + diff --git a/latex2rtf.spec b/latex2rtf.spec index 8eef96d..761b43e 100644 --- a/latex2rtf.spec +++ b/latex2rtf.spec @@ -1,11 +1,13 @@ Name: latex2rtf Version: 2.3.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: LaTeX to RTF converter that handles equations, figures, and cross-references License: GPLv2+ URL: http://latex2rtf.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: 0001-Fix-latex2rtf-FTBFS-with-texinfo-5.patch +# Do not use (non-existent on EL7) a4wide paper style in tests +Patch1: latex2rtf-a4wide.patch # For running the tests BuildRequires: ImageMagick BuildRequires: texinfo @@ -52,6 +54,7 @@ Word for Windows and Word for Macintosh). %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .a4wide # Get rid of iffy permissions. chmod a-x cfg/*.cfg @@ -74,7 +77,7 @@ done %build # Set the necessary config options, including location of config files # -fsigned-char is useful for special arches, don't forget it. -%make_build CFLAGS="%{optflags} -DUNIX -fsigned-char" LDFLAGS="%{?__global_ldflags}" DESTDIR=%{_prefix} CFGDIR=/share/%{name}/cfg +make %{?_smp_mflags} CFLAGS="%{optflags} -DUNIX -fsigned-char" LDFLAGS="%{?__global_ldflags}" DESTDIR=%{_prefix} CFGDIR=/share/%{name}/cfg %install make install DESTDIR=%{buildroot}%{_prefix} @@ -103,6 +106,10 @@ fi %{_mandir}/man1/latex2rtf.1.* %changelog +* Wed May 13 2015 Orion Poplawski - 2.3.8-6 +- Do not use (non-existent on EL7) a4wide paper style in tests (bug #1136065) +- Drop %%make_build for EL7 compatibility + * Thu Feb 19 2015 Christopher Meng - 2.3.8-5 - Fix broken requires again.