rpms/latex2rtf/EL-5 latex2rtf.spec, 1.5, 1.6 sources, 1.2, 1.3 latex2rtf-imgh.patch, 1.1, NONE latex2rtf.patch, 1.1, NONE

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/latex2rtf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21908

Modified Files:
	latex2rtf.spec sources 
Removed Files:
	latex2rtf-imgh.patch latex2rtf.patch 
Log Message:
Update to 2.1.0


Index: latex2rtf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/EL-5/latex2rtf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- latex2rtf.spec	27 Apr 2009 10:39:45 -0000	1.5
+++ latex2rtf.spec	5 Mar 2010 16:57:47 -0000	1.6
@@ -1,26 +1,23 @@
 Name:		latex2rtf
-Version:	1.9.19
-Release:	8%{?dist}
+Version:	2.1.0
+Release:	1%{?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
-# Patch to makefile changing man and info file locations and compiler flags
-Patch0:		latex2rtf.patch
-# Patch to fix wrong height of images on 64-bit architectures
-# Bug https://bugzilla.redhat.com/attachment.cgi?id=341372
-Patch1:		latex2rtf-imgh.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For running the tests
 BuildRequires:		ImageMagick
-BuildRequires:		latex2html
+BuildRequires:		texinfo
+BuildRequires:		texinfo-tex
 %if 0%{?rhel} == 5
 BuildRequires:		tetex-latex
 %else
 BuildRequires:		tex(latex)
 %endif
+
 # For converting images
 Requires:		ImageMagick
 # Info file requirement
@@ -30,18 +27,17 @@ Requires(preun):	info
 %description
 LaTeX2rtf is a translator program which is intended to translate a LaTeX
 document (precisely: the text and a limited subset of LaTeX tags) into the RTF
-format which can be imported by several textprocessors (including Microsoft
+format which can be imported by several text processors (including Microsoft
 Word for Windows and Word for Macintosh). 
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 chmod a-x cfg/*.cfg
+find -name "*.o" -delete
 
 %build
-sed -i 's#@OPTFLAGS@#%{optflags}#g;s#@PREFIX@#%{buildroot}#g;s#@BINDIR@#%{_bindir}#g;s#@MANDIR@#%{_mandir}#g;s#@INFODIR@#%{_infodir}#g;s#@DATADIR@#%{_datadir}#g' Makefile
-make %{?_smp_mflags}
+# Set the necessary config options, including location of config files
+make CFLAGS="%{optflags} -DUNIX -fsigned-char" CFG_INSTALL=%{_datadir}/%{name}/cfg %{?_smp_mflags}
 
 # Change encoding of documentation
 for txtfile in ChangeLog Copyright; do
@@ -51,21 +47,17 @@ for txtfile in ChangeLog Copyright; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install
-make install-info
+rm -rf %{buildroot}
+make install PREFIX=%{buildroot}%{_prefix} MAN_INSTALL=%{buildroot}%{_mandir}/man1
+make install-info PREFIX=%{buildroot}%{_prefix} INFO_INSTALL=%{buildroot}%{_infodir}
+# Remove unnecessary file from infodir
+rm -f %{buildroot}%{_infodir}/dir
 
 %check
-%if 0%{?rhel} != 0
-# Don't do anything since make check fails in a segfault at least on ppc
-%else
-# Otherwise perform check
 make check
-%endif
-
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/install-info --quiet %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -77,35 +69,43 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog Copyright doc/latex2rtf.html doc/latex2rtf.pdf doc/copying.txt doc/credits
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_infodir}/*
-%{_datadir}/%{name}
+%{_bindir}/latex2rtf
+%{_bindir}/latex2png
+%{_mandir}/man1/latex2rtf.1.*
+%{_mandir}/man1/latex2png.1.*
+%{_infodir}/latex2rtf.info.*
+%{_datadir}/latex2rtf/
 
 
 %changelog
-* Mon Apr 27 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-8
+* Fri Mar 05 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.19-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Apr 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-8
 - Added patch to fix image height on 64-bit architectures.
   https://bugzilla.redhat.com/show_bug.cgi?id=497752
 
-* Wed Mar 25 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-7
+* Wed Mar 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-7
 - Retry EPEL fix: disable check phase which doesn't seem to work 
   for some reason on EPEL 5 ppc (segfault in list.tex).
 
-* Sun Mar 22 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-6
+* Sun Mar 22 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-6
 - Fix EPEL build.
 
-* Sat Mar 21 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-5
+* Sat Mar 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-5
 - Keep documentation time stamps when converting encoding.
 
-* Fri Mar 13 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-4
+* Fri Mar 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-4
 - Added check phase.
 
-* Thu Mar 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-3
+* Thu Mar 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-3
 - Review fixes.
 
-* Sun Dec 21 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-2
+* Sun Dec 21 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-2
 - Fix perms on config files.
 
-* Sun Nov 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.9.19-1
+* Sun Nov 02 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.9.19-1
 - First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latex2rtf/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Mar 2009 09:04:43 -0000	1.2
+++ sources	5 Mar 2010 16:57:47 -0000	1.3
@@ -1 +1 @@
-8a3b920d59f6b38736aa256c26374472  latex2rtf-1.9.19.tar.gz
+7b42e25ebdf9afa740d554b930f07d08  latex2rtf-2.1.0.tar.gz


--- latex2rtf-imgh.patch DELETED ---


--- latex2rtf.patch DELETED ---