[latex2rtf/f21: 7/7] Merge branch 'master' into f21

[Christopher Meng]

commit 137beda6c900f5cb38d8433cd69a84c6c281b8ee
Merge: bc22d06 4609843
Author: Christopher Meng <i at cicku.me>
Date:   Thu Aug 28 22:51:51 2014 +0800

    Merge branch 'master' into f21
    
    Conflicts:
    	latex2rtf.spec

 .gitignore                                    |    1 +
 0001-Fix-latex2rtf-FTBFS-with-texinfo-5.patch |   25 ++++++
 latex2rtf-2.2.0-makefile.patch                |   46 -----------
 latex2rtf-2.3.4-docs.patch                    |   51 ------------
 latex2rtf.spec                                |  102 ++++++++++++-------------
 sources                                       |    2 +-
 6 files changed, 77 insertions(+), 150 deletions(-)
---
diff --cc latex2rtf.spec
index 0fa1198,c4e48b6..9074bd0
--- a/latex2rtf.spec
+++ b/latex2rtf.spec
@@@ -1,38 -1,31 +1,31 @@@
- Name:		latex2rtf
- Version:	2.3.7a
- Release:	2%{?dist}
- Summary:	LaTeX to RTF converter that handles equations, figures, and cross-references
- Group:		Applications/File
- License:	GPLv2+
- URL:		http://latex2rtf.sourceforge.net/
- Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
- BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- # Skip broken docs
- Patch0:		latex2rtf-2.3.4-docs.patch
- 
+ Name:           latex2rtf
+ Version:        2.3.8
 -Release:        2%{?dist}
++Release:        1%{?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
  # For running the tests
- BuildRequires:		ImageMagick
- BuildRequires:		texinfo
- BuildRequires:		texinfo-tex
+ BuildRequires:  ImageMagick
+ BuildRequires:  texinfo
+ BuildRequires:  texinfo-tex
  %if 0%{?rhel} == 5
- BuildRequires:		tetex-latex
+ BuildRequires:  tetex-latex
  %else
- BuildRequires:		tex(latex)
+ BuildRequires:  tex(latex)
  %endif
- 
  %if 0%{?fedora} >= 18
- BuildRequires:		texlive-a4wide
- BuildRequires:		texlive-courier
- BuildRequires:		texlive-helvetic
- BuildRequires:		texlive-psfrag
- BuildRequires:		texlive-times
+ BuildRequires:  texlive-a4wide
+ BuildRequires:  texlive-courier
+ BuildRequires:  texlive-helvetic
+ BuildRequires:  texlive-psfrag
+ BuildRequires:  texlive-times
  %endif
- 
  %if 0%{?rhel} > 0
- BuildRequires:		man
+ BuildRequires:  man
  %else
- BuildRequires:		man2html-core
+ BuildRequires:  man2html-core
  %endif
  
  # For converting images
@@@ -89,20 -85,24 +85,22 @@@ if [ $1 = 0 ] ; the
  fi
  
  %files
- %defattr(-,root,root,-)
- %doc ChangeLog Copyright doc/latex2rtf.pdf doc/copying.txt doc/credits
- %{_bindir}/latex2rtf
+ %doc ChangeLog Copyright doc/latex2rtf.pdf doc/latex2rtf.html doc/copying.txt doc/credits
  %{_bindir}/latex2png
- %{_mandir}/man1/latex2rtf.1.*
- %{_mandir}/man1/latex2png.1.*
- %{_infodir}/latex2rtf.info.*
+ %{_bindir}/latex2rtf
  %{_datadir}/latex2rtf/
- 
+ %{_infodir}/latex2rtf.info.*
+ %{_mandir}/man1/latex2png.1.*
+ %{_mandir}/man1/latex2rtf.1.*
  
  %changelog
 -* Thu Aug 28 2014 Christopher Meng <rpm at cicku.me> - 2.3.8-2
++* Thu Aug 28 2014 Christopher Meng <rpm at cicku.me> - 2.3.8-1
++- Update to 2.3.8
+ - Fix FTBFS with texinfo 5.
+ 
 -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.8-2
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.7a-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
  
 -* Wed Jul 30 2014 Christopher Meng <rpm at cicku.me> - 2.3.8-1
 -- Update to 2.3.8
 -
  * Tue Jul 01 2014 Susi Lehtola <jussilehtola at fedoraproject.org> - 2.3.7a-1
  - Update to 2.3.7a.