rpms/tetex-tex4ht/F-7 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 tetex-tex4ht.spec, 1.9, 1.10 tetex-tex4ht-1.0-prev.patch, 1.1, NONE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, 1.1, NONE
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sun Mar 9 15:02:25 UTC 2008
- Previous message (by thread): rpms/tetex-tex4ht/F-8 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 tetex-tex4ht-1.0-rebuild.patch, 1.2, 1.3 tetex-tex4ht.spec, 1.12, 1.13
- Next message (by thread): rpms/tetex-tex4ht/F-7 tetex-tex4ht.spec,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/tetex-tex4ht/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9446
Modified Files:
.cvsignore sources tetex-tex4ht.spec
Removed Files:
tetex-tex4ht-1.0-prev.patch
tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
Log Message:
* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_12_19_2154-1.1
- update to 1.0.2007_12_19_2154
- new debian patch, new literate sources
- adapt for texlive
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 3 Nov 2006 00:41:27 -0000 1.8
+++ .cvsignore 9 Mar 2008 15:01:50 -0000 1.9
@@ -1,4 +1,4 @@
-tex4ht-all-20050228.zip
-tex4ht-lit-20061028.zip
-tex4ht_20060913-1.diff.gz
-tex4ht-1.0.2006_10_28_1705.tar.gz
+tex4ht_20071211-2.diff.gz
+tex4ht-lit-20071220.zip
+tex4ht-all-20070609.zip
+tex4ht-1.0.2007_12_19_2154.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 3 Nov 2006 00:41:27 -0000 1.9
+++ sources 9 Mar 2008 15:01:50 -0000 1.10
@@ -1,4 +1,4 @@
-26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip
-a2837b2bd29e66afb574f1d0f99d4190 tex4ht-lit-20061028.zip
-a69edc1e15d23777bc89b9f3132930b0 tex4ht_20060913-1.diff.gz
-de456f43632f5fb321f5bdbeeb92dfe1 tex4ht-1.0.2006_10_28_1705.tar.gz
+92845008562a935dd214358e2491df75 tex4ht_20071211-2.diff.gz
+0789ef4f7c6983747301d41228633391 tex4ht-lit-20071220.zip
+32fa3f44611fd86259aad939444b87d8 tex4ht-all-20070609.zip
+f1b9eeb9d39364cc0fe21727665f0edd tex4ht-1.0.2007_12_19_2154.tar.gz
Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/F-7/tetex-tex4ht.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-tex4ht.spec 3 Nov 2006 00:41:27 -0000 1.9
+++ tetex-tex4ht.spec 9 Mar 2008 15:01:50 -0000 1.10
@@ -1,48 +1,48 @@
%{!?_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_10_28_1705
-Release: 1%{?dist}
-License: LaTeX Project Public License
+Version: 1.0.2007_12_19_2154
+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
# Source1 is only used for documentation
# renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory
-Source1: tex4ht-all-20050228.zip
+Source1: tex4ht-all-20070609.zip
# unversioned upstream source, downloaded with wget -N
#Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
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-20061028.zip
+Source3: tex4ht-lit-20071220.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
-# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
-Patch2: texmf.cnf.patch
+Patch1: http://ftp.de.debian.org/debian/pool/main/t/tex4ht/tex4ht_20071211-2.diff.gz
# update debian rebuild script
-Patch3: tetex-tex4ht-1.0-prev.patch
-# if building from litteral sources, install xtpipes files in dest
-Patch4: tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
+#Patch3: tetex-tex4ht-1.0-rebuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# kpsewhich should be brought in by kpathsea-devel anyway
BuildRequires: /usr/bin/kpsewhich
-BuildRequires: tetex-fonts
+#BuildRequires: kpathsea-devel
+BuildRequires: java-devel /usr/bin/fastjar
# 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
+# dvips is in texlive-dvips. texlive-latex provides tetex-latex and
+# depends on texlive-dvips.
+Requires: tetex-latex /usr/bin/dvipng
+Requires: java
Requires(post): /usr/bin/texhash
Requires(postun): /usr/bin/texhash
Obsoletes: tex4ht < %{version}-%{release}
@@ -60,46 +60,56 @@
%prep
%setup -q -n tex4ht-%{version}
+# debian patch
%patch1 -p1
-# apply debian path which avoids using xtpipes since we cannot compile it
-patch -p1 < debian/patches/fix_mk4ht.diff
-
chmod a-x src/*.c
-cp %{SOURCE2} lppl.txt
-mkdir doc
-cp %{SOURCE1} doc
-pushd doc
-unzip tex4ht-all-*.zip
-rm *.zip
+cp -p %{SOURCE2} lppl.txt
+# unzip the all source for the doc
+mkdir doc/
+pushd doc/
+ unzip %{SOURCE1}
+ rm *.zip
popd
-mkdir lit
-cp %{SOURCE3} lit
+mkdir lit/
pushd lit
-unzip tex4ht-lit-*.zip
-rm *.zip
-chmod 0644 *.tex
+ unzip %{SOURCE3}
+ chmod 0644 *.tex
popd
-cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
-# avoid duplicating the debian patches while still allowing to rebuild
-# from literate sources
-patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
-patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
-%patch4 -p1 -b .nohome
+cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
+# avoid duplicating the debian patches
+patch -p1 < debian/patches/fix_mk4ht.diff
+# hardcoded /usr/share
+patch -p1 < debian/patches/fix_tex4ht_env.diff
+# use the debian man page
patch -p1 < debian/patches/add_manpage.diff
+# Makefile used as a source of inspiration
+patch -p1 < debian/patches/add_Makefile.diff
+patch -p1 < debian/patches/add_xtpipes_support
+patch -p1 < debian/patches/Makefile_indep_arch
+# scripts and texmf.cnf excerpt for debian not used
+patch -p1 < debian/patches/add_scripts_sh.diff
+patch -p1 < debian/patches/add_texmf_cnf.diff
-cp %{PATCH2} debian/lit/
+# patches for literate sources
+patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
+patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
+#%patch4 -p1 -b .nohome
-%patch3 -p1 -b .prev
+#%patch3 -p1 -b .rebuild
-chmod a+x debian/lit/rebuild.sh*
+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 \{\} \;
+# add ht shebang
+echo "#! /bin/sh" | cat - bin/unix/ht > ht.new
+mv ht.new bin/unix/ht
+
%build
pushd src
CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H \
@@ -107,33 +117,42 @@
LDFLAGS=-lkpathsea
gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
-popd
-# files in bin/ht/unix have a shebang but use xtpipes
+# 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
-# add shebangs to the scripts that lacks one
-for file in bin/unix/*; do
- if grep '^#! */' $file > /dev/null 2>&1; then continue; fi
- echo "#! /bin/sh" | cat - $file > $file.new
- mv $file.new $file
-done
+# 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 -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
+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
@@ -143,7 +162,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;' \
@@ -157,6 +176,12 @@
%defattr(-,root,root,-)
%{_texmf}/tex4ht/
%{_texmf}/tex/generic/tex4ht/
+#%{_bindir}/ht*
+#%{_bindir}/tex4ht-ht
+#%{_bindir}/mk4ht
+#%{_bindir}/tex4ht
+#%{_bindir}/t4ht
+%{_scriptsdir}/
%{_bindir}/*
%{_mandir}/man1/tex4ht.1*
%doc lppl.txt doc tutorial README.kpathsea
@@ -168,6 +193,25 @@
texhash > /dev/null 2>&1 || :
%changelog
+* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_12_19_2154-1.1
+- update to 1.0.2007_12_19_2154
+- new debian patch, new literate sources
+- adapt for texlive
+
+* Sun Nov 25 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_11_19_2329-1
+- update to 1.0.2007_11_19_2329 and use new literate sources
+
+* Sun Nov 11 2007 Patrice Dumas <pertusus at free.fr> 1.0.2007_11_07_1645-1
+- update to 1.0.2007_11_07_1645
+
+* 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
+
+* 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
+
* Fri Nov 3 2006 Patrice Dumas <pertusus at free.fr> 1.0.2006_10_28_1705-1
- update
- use debian patchset
--- tetex-tex4ht-1.0-prev.patch DELETED ---
--- tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch DELETED ---
- Previous message (by thread): rpms/tetex-tex4ht/F-8 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 tetex-tex4ht-1.0-rebuild.patch, 1.2, 1.3 tetex-tex4ht.spec, 1.12, 1.13
- Next message (by thread): rpms/tetex-tex4ht/F-7 tetex-tex4ht.spec,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list