rpms/tetex-tex4ht/devel .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 tetex-tex4ht-1.0-rebuild.patch, 1.1, 1.2 tetex-tex4ht.spec, 1.11, 1.12 tetex-tex4ht-1.0-macros.patch, 1.1, NONE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, 1.1, NONE tex4ht-1.0-fix_mk4ht.patch, 1.1, NONE
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Fri Sep 21 09:54:06 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356
Modified Files:
.cvsignore sources tetex-tex4ht-1.0-rebuild.patch
tetex-tex4ht.spec
Removed Files:
tetex-tex4ht-1.0-macros.patch
tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
tex4ht-1.0-fix_mk4ht.patch
Log Message:
* Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
- update to 1.0.2007_09_04_0340
- use all the debian patches
- install correctly the scripts out of bindir
- prefix ht with tex4ht- to avoid name collisions
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 4 Aug 2007 21:51:29 -0000 1.9
+++ .cvsignore 21 Sep 2007 09:53:30 -0000 1.10
@@ -1,4 +1,4 @@
+tex4ht-1.0.2007_09_04_0340.tar.gz
tex4ht-all-20070609.zip
-tex4ht-lit-20070717.zip
-tex4ht-1.0.2007_07_17_0228.tar.gz
-tex4ht_20060913-1.diff.gz
+tex4ht-lit-20070904.zip
+tex4ht_20070904-1.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 4 Aug 2007 21:51:29 -0000 1.10
+++ sources 21 Sep 2007 09:53:30 -0000 1.11
@@ -1,4 +1,4 @@
+dc7d1b45f9053ad3387eaadda2167b5b tex4ht-1.0.2007_09_04_0340.tar.gz
32fa3f44611fd86259aad939444b87d8 tex4ht-all-20070609.zip
-217f977cb7e43fbb917832a8f5c77a6b tex4ht-lit-20070717.zip
-f27125cc6da21402170faac90eeafdc5 tex4ht-1.0.2007_07_17_0228.tar.gz
-a69edc1e15d23777bc89b9f3132930b0 tex4ht_20060913-1.diff.gz
+bd797ccaf2f6819f21ce4e8827cee519 tex4ht-lit-20070904.zip
+a0650cd770a1362fb054c3cf1a3ec6b2 tex4ht_20070904-1.diff.gz
tetex-tex4ht-1.0-rebuild.patch:
Index: tetex-tex4ht-1.0-rebuild.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht-1.0-rebuild.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-tex4ht-1.0-rebuild.patch 4 Aug 2007 21:51:29 -0000 1.1
+++ tetex-tex4ht-1.0-rebuild.patch 21 Sep 2007 09:53:30 -0000 1.2
@@ -1,240 +1,25 @@
-diff -up tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh
---- tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh.rebuild 2007-08-04 21:22:56.000000000 +0200
-+++ tex4ht-1.0.2007_07_17_0228/debian/lit/rebuild.sh 2007-08-04 21:23:00.000000000 +0200
-@@ -3,6 +3,8 @@
- # This program is released into the public domain.
- # You may do whatever you please with it.
-
-+set -x
-+
- # This script takes the literate sources for Eitan Gurari's TeX4HT
- # system and produces a directory tree like the one that is
- # distributed as a tar.gz archive. It is gleaned from the 3-4 line
-@@ -25,11 +27,17 @@
- # (b) the top-level tree of TeX4HT in src/ texmf/ bin/
- # (c) the Debian stuff in the subdirectory debian/
- # The new tree is built in the subdirectory dest/
-+
-+bootstrap=yes
-+[ z"$1" = 'z-k' ] && bootstrap=no
-+
- TOP=${PWD}
- LITDIR=${TOP}/lit
- DESTDIR=${TOP}/dest
- DEBDIR=${TOP}/debian
-
-+unset TEXINPUTS TEXMFCNF TEX4HTINPUTS T4HTINPUTS \
-+ TEX4HTFONTSET TEXINPUTS_tex4ht TEXINPUTS_t4ht
- # We need a different texmf.cnf that expands
- # TeX's memory usage. We will create this in
- # the following directory:
-@@ -37,10 +45,10 @@ TEXMFCNF=${DESTDIR}
- # The order of directories searched for input
- # is: first the newly created files, then the
- # distributed tree and finally the existing installation.
--TEXINPUTS=${LITDIR}:${DESTDIR}/texmf/tex//:${TOP}/texmf/tex//:
--TEX4HTINPUTS=${DESTDIR}/texmf/tex4ht//:${TOP}/texmf/tex4ht//:
--T4HTINPUTS=${DESTDIR}/texmf/tex4ht//:${TOP}/texmf/tex4ht//:
--TEX4HTFONTSET=${DESTDIR}/texmf/tex4ht/ht-fonts//:${TOP}/texmf/tex4ht/ht-fonts/:
-+TEXINPUTS=${LITDIR}:${DESTDIR}/texmf/tex//:
-+TEX4HTINPUTS=${DESTDIR}/texmf/tex4ht//:
-+T4HTINPUTS=${DESTDIR}/texmf/tex4ht//:
-+TEX4HTFONTSET=${DESTDIR}/texmf/tex4ht/ht-fonts//:
- TEXINPUTS_tex4ht="$TEX4HTINPUTS"
- TEXINPUTS_t4ht="$T4HTINPUTS"
-
-@@ -49,7 +57,7 @@ LC_CTYPE=C
- LANG=C
- # The installation will run some scripts like xhlatex
- # which are installed in /usr/share/tex4ht in Debian.
--PATH=$PATH:/usr/share/tex4ht
-+PATH=$PATH:/usr/share/tex4ht:$DESTDIR/bin/linux:$DESTDIR/bin/unix
-
- export LANG LC_CTYPE PATH
-
-@@ -57,7 +65,7 @@ export LANG LC_CTYPE PATH
- function texclean()
- {
-
-- rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc}
-+ rm -f *.{aux,dvi,idv,4tc,4ct,log,lg,xref,tmp,trc} mktex4ht.cnf
-
- }
-
-@@ -66,7 +74,9 @@ function texclean()
- function mkdirheir()
- {
- mkdir -p ${DESTDIR}/texmf/tex/generic/tex4ht
-- mkdir -p ${DESTDIR}/bin/{unix,win32}
-+ # these files are required for bootstrap, see below
-+ cp ${TOP}/texmf/tex/generic/tex4ht/{tex4ht,html4-math,html4,info4ht,infoht4,infomml}.4ht ${DESTDIR}/texmf/tex/generic/tex4ht
-+ mkdir -p ${DESTDIR}/bin/{unix,win32,linux}
- mkdir -p ${DESTDIR}/texmf/tex4ht/{xttl,bin,ht-fonts}
- mkdir -p ${DESTDIR}/texmf/tex4ht/base/{unix,win32}
- mkdir -p ${DESTDIR}/src
-@@ -119,27 +129,78 @@ function movefiles()
- [ -d ${LITDIR} -a -d ${DEBDIR} ] || \
- (echo "Must be in top-level source directory to run this"; exit 0)
-
-+# the trick is to avoid argument list too long for rm!
-+[ $bootstrap = 'yes' ] && rm -rf ${DESTDIR}/*.htf && rm -rf ${DESTDIR}/*
-+
- # Initialise the working environment
- mkdirheir
- makesomefiles
- setupenv
-+
- cd $DESTDIR
-
-+if [ $bootstrap = 'yes' ]; then
-+# make some 4ht files. This creates th4.4ht.
-+tex tex4ht-4ht || exit 1
-+# Now make tex4ht.sty. Indeed tex4ht-4ht and other tex files require
-+# tex4ht.sty to do the other 4ht files
-+tex tex4ht-sty || exit 1
-+# Make cond4ht.4ht, required for next tex4ht-4ht run.
-+tex tex4ht-cond4ht || exit 1
-+# now that th4.4ht is present, mktex4ht.4ht files is created, by using
-+# tex4ht.sty. It is during that run that {tex4ht,html4-math,html4}.4ht
-+# are required.
-+tex tex4ht-4ht || exit 1
-+# creates tex4ht.4ht. Needs {info4ht,infoht4,infomml}.4ht
-+latex tex4ht-options || exit 1
-+# remaining 4ht files required for bootstrap
-+for htype in html4 info info-html4 info-mml; do
-+ latex tex4ht-${htype}.tex
-+ latex tex4ht-${htype}.tex
-+ latex tex4ht-${htype}.tex
-+done
-+# now that bootstrap is done remove the bootstrap files, and replace them
-+# with the generated files
-+rm texmf/tex/generic/tex4ht/*
-+movefiles
-+texclean
-+
-+# restart everything with the bootstraped files
-+tex tex4ht-sty || exit 1
-+tex tex4ht-cond4ht || exit 1
-+tex tex4ht-4ht || exit 1
-+latex tex4ht-options || exit 1
-+for htype in html4 info info-html4 info-mml; do
-+ latex tex4ht-${htype}.tex
-+ latex tex4ht-${htype}.tex
-+ latex tex4ht-${htype}.tex
-+done
-+# install bootstrapped 4ht files
-+movefiles
-+texclean
-+fi
-+
-+# now start the build from the beginning
-+
- # Make tex4ht.c
--tex tex4ht-c
-+tex tex4ht-c || exit 1
-
- # Make t4ht.c
--tex tex4ht-t4ht
-+tex tex4ht-t4ht || exit 1
-+
-+# Make htcmd
-+tex tex4ht-htcmd || exit 1
-
- # Make scripts
--latex tex4ht-mkht
--latex ./mkht-scripts.4ht
-+latex tex4ht-mkht || exit 1
-+perl -c mk4ht.perl || exit 1
-+latex ./mkht-scripts.4ht || exit 1
-
- # Make tex4ht.sty
- tex tex4ht-sty
-
- # Make tex4ht.env
--latex tex4ht-env
-+latex tex4ht-env || exit 1
-
- # Make basic 4ht files
- tex tex4ht-4ht
-@@ -151,7 +212,19 @@ latex tex4ht-options
- movefiles
- texclean
-
--# For html ht styles. It is important that
-+# set the script executables
-+chmod a+x bin/unix/*
-+
-+if [ $bootstrap = 'yes' ]; then
-+# compile the executables
-+ for file in src/*.c; do
-+ basefile=`basename $file .c`
-+ #cc -O2 -g -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H -DHAVE_SYS_DIR_H -DENVFILE="\"/usr/share/texmf/tex4ht/base/unix/tex4ht.env\"" $file -o bin/linux/$basefile || exit 1
-+ cc -O2 -g -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H -DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE="\"/usr/share/texmf/tex4ht/base/unix/tex4ht.env\"" $file -o bin/linux/$basefile -lkpathsea || exit 1
-+ done
-+fi
-+
-+# For 23 html ht styles. It is important that
- # The current directory be the last in the search
- # path for some of these builds to work.
- for htype in html4 html-speech info info-mml info-html4 \
-@@ -159,7 +232,7 @@ for htype in html4 html-speech info info
- jsmath javahelp info-javahelp mathml mathltx mathplayer \
- moz ooffice info-ooffice tei svg word unicode bibtex2
- do
-- latex tex4ht-${htype}.tex
-+ latex tex4ht-${htype}.tex || exit 1
- latex tex4ht-${htype}.tex
- latex tex4ht-${htype}.tex
- movefiles
-@@ -168,23 +241,32 @@ done
+diff -up tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh
+--- tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh.rebuild 2007-09-21 07:52:12.000000000 +0200
++++ tex4ht-1.0.2007_09_04_0340/debian/lit/rebuild.sh 2007-09-21 08:01:07.000000000 +0200
+@@ -260,11 +260,17 @@ done
# The xttl files are for the experimental speech support.
# These are built using xhlatex.
++# use javac
++# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
+ htlatex xtpipes "xhtml,3,next" "" "-d./"
-xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
-xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
-xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
-+# xtpipes is missing? jsml.4ht is then missing as are the java files
-+# and xttl/jsml.4xt, and base/*/xv4ht.cat and the xtpipes dtd
-+#htlatex xtpipes "xhtml,3,next" "" "-d./" || exit 1
-+xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./" || exit 1
-+htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./" || exit 1
-+xhlatex tex4ht-html-speech "html,3,sections+" || exit 1
+-htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
++htlatex tex4ht-docbook-xtpipes "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
++htlatex tex4ht-oo-xtpipes "xhtml,next,3" "" "-d./"
++#xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
++htlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
++#htlatex tex4ht-xhtml-xttl "xhtml,next,3" "" "-d./"
++htlatex tex4ht-xhtml-xtpipes "xhtml,next,3" "" "-d./"
+ xhlatex tex4ht-html-speech "html,3,sections+"
movefiles
- texclean
-
- # Make font files. The Needs directives in this file cause "t4ht" to
- # move the files into their correct locations automatically.
--tex tex4ht-fonts-noncjk
--tex tex4ht-fonts-noncjk
--tex4ht tex4ht-fonts-noncjk
--t4ht tex4ht-fonts-noncjk
--latex tex4ht-fonts-4hf
--latex tex4ht-fonts-4hf
--tex4ht tex4ht-fonts-4hf
--t4ht tex4ht-fonts-4hf
-+for font in noncjk cjk; do
-+tex tex4ht-fonts-${font}
-+tex tex4ht-fonts-${font}
-+tex4ht tex4ht-fonts-${font}
-+t4ht tex4ht-fonts-${font} || exit 1
-+done
-+for font in 4hf; do
-+latex tex4ht-fonts-${font}
-+latex tex4ht-fonts-${font}
-+tex4ht tex4ht-fonts-${font}
-+t4ht tex4ht-fonts-${font} || exit 1
-+done
-
- movefiles
- texclean
-@@ -192,4 +274,6 @@ texclean
- # That's it.
-
- exit 0
--wripro.tex
-+# latex tex4ht-auto-script fails, and the scripts don't seem to be shipped
-+# tex4ht-fonts-modern.tex lacks a preamble
-+# what is wripro.tex?
Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tetex-tex4ht.spec 9 Aug 2007 13:16:16 -0000 1.11
+++ tetex-tex4ht.spec 21 Sep 2007 09:53:30 -0000 1.12
@@ -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.2007_07_17_0228
+Version: 1.0.2007_09_04_0340
Release: 1%{?dist}
-License: LaTeX
+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
@@ -16,29 +18,22 @@
Source2: tex4ht-lppl.txt
# unversioned upstream litteral source, downloaded with wget -N
#Source3: http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
-Source3: tex4ht-lit-20070717.zip
+Source3: tex4ht-lit-20070904.zip
Source4: http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
Source5: http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
Source6: http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
Source7: http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
-#Patch0: tex4ht-1.0.2006_10_24_0142-paths.patch
# debian
-Patch1: http://ftp.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz
+Patch1: http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20070904-1.diff.gz
# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
Patch2: texmf.cnf.patch
# update debian rebuild script
Patch3: tetex-tex4ht-1.0-rebuild.patch
-# if building from literate sources, install xtpipes files in dest
-#Patch4: tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
-# rebased from debian
-Patch5: tex4ht-1.0-fix_mk4ht.patch
-# add required macros to tex4ht-4ht.tex for bootstrap of rebuild from
-# literate sources
-Patch6: tetex-tex4ht-1.0-macros.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /usr/bin/kpsewhich
BuildRequires: tetex-fonts
+BuildRequires: java-devel /usr/bin/fastjar
# for uudecode to generate the debian tutorial images
BuildRequires: sharutils
# pnmcrop and pnmtopng are in netpbm-progs.
@@ -48,6 +43,7 @@
# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
# dvipng is in tetex. tetex-latex depends on tetex.
Requires: tetex-latex
+Requires: java
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash
Obsoletes: tex4ht < %{version}-%{release}
@@ -68,11 +64,6 @@
# debian patch
%patch1 -p1
-# apply debian path which avoids using xtpipes since we cannot compile it
-# debian patch doesn't apply anymore to newer source
-#patch -p1 -b -z .fix_mk4ht < debian/patches/fix_mk4ht.diff
-%patch5 -p1 -b .fix_mk4ht
-
chmod a-x src/*.c
cp -p %{SOURCE2} lppl.txt
# unzip the all source for the doc
@@ -86,19 +77,24 @@
unzip %{SOURCE3}
chmod 0644 *.tex
popd
-# patch literate sources
-%patch6 -p1 -b .macros
cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
-# avoid duplicating the debian patches while still allowing to rebuild
-# from literate sources
+# avoid duplicating the debian patches
+# used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/add_manpage.diff
+# not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/fix_mk4ht.diff
+# hardcoded /usr/share
+patch -p1 < debian/patches/fix_tex4ht_env.diff
+
patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
#%patch4 -p1 -b .nohome
-patch -p1 < debian/patches/add_manpage.diff
-
cp -p %{PATCH2} debian/lit/
%patch3 -p1 -b .rebuild
@@ -120,24 +116,42 @@
LDFLAGS=-lkpathsea
gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
+
+# adapted from debian Makefile
+mkdir class
+javac -d class -source 1.5 java/*.java java/xtpipes/*.java java/xtpipes/util/*.java
+fastjar -c -f tex4ht.jar -m java/manifest -C class .
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
+
%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/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 bin/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
+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
+mkdir -p $RPM_BUILD_ROOT%{_texmf}/tex/generic
cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
popd
@@ -147,7 +161,7 @@
> README.kpathsea
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-sed -e 's;@SCRIPTSDIR@;%{_bindir};' \
+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;' \
@@ -161,7 +175,12 @@
%defattr(-,root,root,-)
%{_texmf}/tex4ht/
%{_texmf}/tex/generic/tex4ht/
-%{_bindir}/*
+%{_bindir}/ht*
+%{_bindir}/tex4ht-ht
+%{_bindir}/mk4ht
+%{_bindir}/tex4ht
+%{_bindir}/t4ht
+%{_scriptsdir}/
%{_mandir}/man1/tex4ht.1*
%doc lppl.txt doc tutorial README.kpathsea
@@ -172,6 +191,12 @@
texhash > /dev/null 2>&1 || :
%changelog
+* Fri Sep 21 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_09_04_0340-1
+- update to 1.0.2007_09_04_0340
+- use all the debian patches
+- install correctly the scripts out of bindir
+- prefix ht with tex4ht- to avoid name collisions
+
* Sat Aug 4 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_07_17_0228-1
- update to 1.0.2007_07_17_0228
- rename tetex-tex4ht-1.0-prev.patch to tetex-tex4ht-1.0-rebuild.patch
--- tetex-tex4ht-1.0-macros.patch DELETED ---
--- tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch DELETED ---
--- tex4ht-1.0-fix_mk4ht.patch DELETED ---
More information about the fedora-extras-commits
mailing list