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

[Christopher Meng]

commit abbbec9da688bccb2c5b2e09ce4d7efb9a25f4a0
Merge: 137beda 0be0ce3
Author: Christopher Meng <i at cicku.me>
Date:   Tue Feb 17 19:36:49 2015 +0800

    Merge branch 'master' into f21

 latex2rtf.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc latex2rtf.spec
index 9074bd0,937f636..86df696
--- a/latex2rtf.spec
+++ b/latex2rtf.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           latex2rtf
  Version:        2.3.8
- Release:        1%{?dist}
 -Release:        3%{?dist}
++Release:        2%{?dist}
  Summary:        LaTeX to RTF converter that handles equations, figures, and cross-references
  License:        GPLv2+
  URL:            http://latex2rtf.sourceforge.net/
@@@ -94,13 -96,18 +96,15 @@@ f
  %{_mandir}/man1/latex2rtf.1.*
  
  %changelog
 -* Mon Feb 02 2015 Christopher Meng <rpm at cicku.me> - 2.3.8-3
++* Mon Feb 02 2015 Christopher Meng <rpm at cicku.me> - 2.3.8-2
+ - Add missing requires for latex2png
+ 
 -* Thu Aug 28 2014 Christopher Meng <rpm at cicku.me> - 2.3.8-2
 -- Fix FTBFS with texinfo 5.
 +* 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.