[latex2rtf] Update to 2.2.0.

Jussi Lehtola jussilehtola at fedoraproject.org
Wed Jun 6 21:55:47 UTC 2012


commit a4df0cd73ffe4cf519e361952e84e422711c84dd
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Thu Jun 7 00:55:43 2012 +0300

    Update to 2.2.0.

 latex2rtf-2.2.0-makefile.patch |   46 ++++++++++++++++++++++++++++++++++++++++
 latex2rtf.spec                 |    8 +++++-
 2 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/latex2rtf-2.2.0-makefile.patch b/latex2rtf-2.2.0-makefile.patch
new file mode 100644
index 0000000..e13b8eb
--- /dev/null
+++ b/latex2rtf-2.2.0-makefile.patch
@@ -0,0 +1,46 @@
+diff -up latex2rtf-2.2.0/Makefile.makefile latex2rtf-2.2.0/Makefile
+--- latex2rtf-2.2.0/Makefile.makefile	2012-06-04 23:35:32.000000000 +0300
++++ latex2rtf-2.2.0/Makefile	2012-06-07 00:55:16.849315061 +0300
+@@ -31,8 +31,8 @@ BINARY_NAME=latex2rtf$(EXE_SUFFIX)
+ 
+ # Location of binary, man, info, and support files - adapt as needed
+ BINDIR=/bin
+-MANDIR=/$(PKGMANDIR)/man1
+-INFODIR=/info
++MANDIR=/share/$(PKGMANDIR)/man1
++INFODIR=/share/info
+ SUPPORTDIR=/share/latex2rtf
+ CFGDIR=/share/latex2rtf/cfg
+ 
+@@ -213,14 +213,14 @@ install: latex2rtf doc/latex2rtf.1 $(CFG
+ 	$(MKDIR) $(DESTDIR)$(BINDIR)
+ 	$(MKDIR) $(DESTDIR)$(MANDIR)
+ 	$(MKDIR) $(DESTDIR)$(CFGDIR)
+-	cp $(BINARY_NAME)     $(DESTDIR)$(BINDIR)
+-	cp scripts/latex2png  $(DESTDIR)$(BINDIR)
+-	cp doc/latex2rtf.1    $(DESTDIR)$(MANDIR)
+-	cp doc/latex2png.1    $(DESTDIR)$(MANDIR)
+-	cp $(CFGS)            $(DESTDIR)$(CFGDIR)
+-	cp doc/latex2rtf.html $(DESTDIR)$(SUPPORTDIR)
+-	cp doc/latex2rtf.pdf  $(DESTDIR)$(SUPPORTDIR)
+-	cp doc/latex2rtf.txt  $(DESTDIR)$(SUPPORTDIR)
++	cp -p $(BINARY_NAME)     $(DESTDIR)$(BINDIR)
++	cp -p scripts/latex2png  $(DESTDIR)$(BINDIR)
++	cp -p doc/latex2rtf.1    $(DESTDIR)$(MANDIR)
++	cp -p doc/latex2png.1    $(DESTDIR)$(MANDIR)
++	cp -p $(CFGS)            $(DESTDIR)$(CFGDIR)
++	cp -p doc/latex2rtf.html $(DESTDIR)$(SUPPORTDIR)
++	cp -p doc/latex2rtf.pdf  $(DESTDIR)$(SUPPORTDIR)
++	cp -p doc/latex2rtf.txt  $(DESTDIR)$(SUPPORTDIR)
+ 	@echo "******************************************************************"
+ 	@echo "*** latex2rtf successfully installed as \"$(BINARY_NAME)\""
+ 	@echo "*** in directory \"$(DESTDIR)$(BINDIR)\""
+@@ -238,7 +238,7 @@ install: latex2rtf doc/latex2rtf.1 $(CFG
+ 
+ install-info: doc/latex2rtf.info
+ 	$(MKDIR) $(DESTDIR)$(INFODIR)
+-	cp doc/latex2rtf.info $(DESTDIR)$(INFODIR)
++	cp -p doc/latex2rtf.info $(DESTDIR)$(INFODIR)
+ 	install-info --info-dir=$(DESTDIR)$(INFODIR) doc/latex2rtf.info
+ 
+ realclean: checkdir clean
diff --git a/latex2rtf.spec b/latex2rtf.spec
index f322e4f..7773c2d 100644
--- a/latex2rtf.spec
+++ b/latex2rtf.spec
@@ -8,6 +8,9 @@ URL:		http://latex2rtf.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Preserve time stamps on install
+Patch0:		latex2rtf-2.2.0-makefile.patch
+
 # For running the tests
 BuildRequires:		ImageMagick
 BuildRequires:		texinfo
@@ -32,6 +35,7 @@ Word for Windows and Word for Macintosh).
 
 %prep
 %setup -q
+%patch0 -p1 -b .makefile
 chmod a-x cfg/*.cfg
 find -name "*.o" -delete
 
@@ -48,8 +52,8 @@ done
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-make install-info DESTDIR=%{buildroot} 
+make install DESTDIR=%{buildroot}%{_usr}
+make install-info DESTDIR=%{buildroot}%{_usr}
 # Remove unnecessary file from infodir
 rm -f %{buildroot}%{_infodir}/dir
 


More information about the scm-commits mailing list