rpms/tetex-tex4ht/EL-5 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 tetex-tex4ht.spec, 1.8, 1.9 tex4ht-env.patch, 1.1, NONE

Sun Dec 30 22:21:40 UTC 2007

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17243

Modified Files:
	.cvsignore sources tetex-tex4ht.spec 
Removed Files:
	tex4ht-env.patch 
Log Message:
* Fri Nov  3 2006 Patrice Dumas <pertusus at free.fr> 1.0.2006_08_26_2341-2.1
- use debian patchset
- remove the patch modifying paths in tex4ht.env, it is unneeded with
  kpathsee



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8

--- .cvsignore	28 Aug 2006 10:32:14 -0000	1.7
+++ .cvsignore	30 Dec 2007 22:21:03 -0000	1.8
@@ -1 +1,3 @@
+tex4ht-all-20050228.zip
 tex4ht-1.0.2006_08_26_2341.tar.gz
+tex4ht_20060913-1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2006 18:27:01 -0000	1.8
+++ sources	30 Dec 2007 22:21:03 -0000	1.9
@@ -1,2 +1,3 @@
-2dd8bbec7cb147391ca08efe4ae7d445  tex4ht-1.0.2006_08_26_2341.tar.gz
 26eb8df2d6631794b3df0d6fb87a0219  tex4ht-all-20050228.zip
+2dd8bbec7cb147391ca08efe4ae7d445  tex4ht-1.0.2006_08_26_2341.tar.gz
+a69edc1e15d23777bc89b9f3132930b0  tex4ht_20060913-1.diff.gz


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/EL-5/tetex-tex4ht.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tetex-tex4ht.spec	6 Sep 2006 10:46:07 -0000	1.8
+++ tetex-tex4ht.spec	30 Dec 2007 22:21:03 -0000	1.9
@@ -1,10 +1,12 @@
 %{!?_texmf: %define _texmf %(eval "[ -x /usr/bin/kpsewhich ] && echo `kpsewhich -expand-var '$TEXMFMAIN'` || echo %{_datadir}/texmf")}
 
+%define _scriptsdir %{_datadir}/tex4ht
+
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
 Version:       1.0.2006_08_26_2341
-Release:       2%{?dist}
-License:       LaTeX Project Public License
+Release:       2%{?dist}.1
+License:       LPPL
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
 Source0:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-%{version}.tar.gz
@@ -14,17 +16,24 @@
 # unversioned upstream source, downloaded with wget -N
 #Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
 Source2:       tex4ht-lppl.txt
-Patch0:        tex4ht-env.patch
+Patch1:        http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /usr/bin/kpsewhich
 BuildRequires:  tetex-fonts
-Requires:       ImageMagick
+# for uudecode to generate the debian tutorial images
+BuildRequires:  sharutils
+# pnmcrop and pnmtopng are in netpbm-progs. 
+Requires:       netpbm-progs
+# ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript
+Requires:       ImageMagick pstoedit
+# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
+# dvipng is in tetex. tetex-latex depends on tetex.
 Requires:       tetex-latex
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
-Obsoletes:      tex4ht
-Provides:       tex4ht
+Obsoletes:      tex4ht < %{version}-%{release}
+Provides:       tex4ht = %{version}-%{release}
 
 # description taken from ctan and modified
 %description 
@@ -38,16 +47,31 @@
 
 %prep
 %setup -q -n tex4ht-%{version}
-%patch -p 1
+# debian patch
+%patch1 -p1
+
 chmod a-x src/*.c
-cp %{SOURCE2} lppl.txt
-mkdir doc
-cp %{SOURCE1} doc
-pushd doc 
-unzip tex4ht-all-*.zip
-rm -f *.zip
+cp -p %{SOURCE2} lppl.txt
+# unzip the all source for the doc
+mkdir doc/
+pushd doc/
+  unzip %{SOURCE1}
+  rm *.zip
 popd
 
+# avoid duplicating the debian patches
+# used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_manpage.diff
+# not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/fix_mk4ht.diff
+patch -p1 < debian/patches/fix_tex4ht_env.diff
+
+chmod a+x debian/lit/rebuild.sh
+
+(cd debian/images; for i in *.uue; do uudecode $i; done; mv *.png ../html)
+
 find  texmf -type f -exec chmod a-x \{\} \;
 
 %build
@@ -55,12 +79,17 @@
 CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H \
  -DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE=\"%{_texmf}/tex4ht/base/unix/tex4ht.env\""
 LDFLAGS=-lkpathsea
-gcc -c $CFLAGS tex4ht.c
-gcc -c $CFLAGS t4ht.c
-gcc -o tex4ht tex4ht.o $LDFLAGS
-gcc -o t4ht t4ht.o $LDFLAGS
+gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
+gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
 popd
 
+# beware of the %% that have to be protected as %%%%
+sed \
+  -e "s;^i.*/ht-fonts/;i%{_texmf}/tex4ht/ht-fonts/;" \
+  -e "s;^tpath/tex/;t%{_texmf}/;" \
+  -e "s;%%%%~/texmf-dist/;%{_texmf}/;" \
+ texmf/tex4ht/base/unix/tex4ht.env > tex4ht.env
+
 # add shebangs to the scripts that lacks one
 for file in bin/unix/*; do
     if grep '^#! */' $file > /dev/null 2>&1; then continue; fi 
@@ -71,21 +100,40 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d -m755 $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_scriptsdir}
 install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
-install -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir}
+#install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
+install -p -m755 bin/unix/* $RPM_BUILD_ROOT%{_scriptsdir}
+for script in httex htlatex httexi htcontext htxetex htxelatex mk4ht; do
+  install -p -m755 bin/unix/$script $RPM_BUILD_ROOT%{_bindir}
+done
+install -p -m755 bin/unix/ht $RPM_BUILD_ROOT%{_bindir}/tex4ht-ht
+install -p -m644 src/tex4ht.jar $RPM_BUILD_ROOT%{_scriptsdir}
 
-pushd texmf
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
-cp tex4ht/base/unix/tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
+cp tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
 
-cp -r tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
+pushd texmf
+cp -pr tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
+cp -pr tex4ht/xtpipes $RPM_BUILD_ROOT%{_texmf}/tex4ht
 
-install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/generic
-cp -r tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex/generic
+cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
 popd
 
+cp -pr debian/html tutorial
+
+sed 's/Debian packaged/Debian and Fedora packaged/' debian/README.kpathsea \
+   > README.kpathsea 
+
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+sed -e 's;@SCRIPTSDIR@;%{_scriptsdir};' \
+ -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \
+ -e 's;@TEXMFCNF@;%{_texmf}/web2c/texmf.cnf;' \
+ -e 's;@HTFDIR@;%{_texmf}/tex4ht/ht-fonts;' \
+ -e 's;@TEXDIR@;%{_texmf}/tex/generic/tex4ht;g' \
+ src/tex4ht.man > $RPM_BUILD_ROOT%{_mandir}/man1/tex4ht.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,8 +142,14 @@
 %defattr(-,root,root,-)
 %{_texmf}/tex4ht/
 %{_texmf}/tex/generic/tex4ht/
-%{_bindir}/*
-%doc lppl.txt doc
+%{_bindir}/ht*
+%{_bindir}/tex4ht-ht
+%{_bindir}/mk4ht
+%{_bindir}/tex4ht
+%{_bindir}/t4ht
+%{_scriptsdir}/
+%{_mandir}/man1/tex4ht.1*
+%doc lppl.txt doc tutorial README.kpathsea 
 
 %post
 texhash > /dev/null 2>&1 || :
@@ -104,6 +158,11 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Fri Nov  3 2006 Patrice Dumas <pertusus at free.fr> 1.0.2006_08_26_2341-2.1
+- use debian patchset
+- remove the patch modifying paths in tex4ht.env, it is unneeded with
+  kpathsee
+
 * Mon Aug 28 2006 Patrice Dumas <pertusus at free.fr> 1.0.2006_08_26_2341-2
 - update
 


--- tex4ht-env.patch DELETED ---


