OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 07-Nov-2002 21:18:20
Branch: HEAD Handle: 2002110720181802
Modified files:
openpkg-re/vcheck vc.html2latex
openpkg-src/html2latex html2latex.spec
openpkg-web news.txt
Log:
use perl-xml stuff which now has everything we need here
Summary:
Revision Changes Path
1.11 +0 -30 openpkg-re/vcheck/vc.html2latex
1.27 +25 -116 openpkg-src/html2latex/html2latex.spec
1.1965 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.html2latex
============================================================
$ cvs diff -u -r1.10 -r1.11 vc.html2latex
--- openpkg-re/vcheck/vc.html2latex 20 Oct 2002 07:22:17 -0000 1.10
+++ openpkg-re/vcheck/vc.html2latex 7 Nov 2002 20:18:18 -0000 1.11
@@ -6,34 +6,4 @@
url = http://prdownloads.sourceforge.net/html2latex/
regex = html2latex-(__VER__)\.tar\.gz
}
-prog html2latex:expat = {
- version = 1.95.5
- url = http://prdownloads.sourceforge.net/expat/
- regex = expat-(__VER__)\.tar\.gz
-}
-prog html2latex:HTML-Parser = {
- version = 3.26
- url = http://www.cpan.org/modules/by-module/HTML/
- regex = HTML-Parser-(__VER__)\.tar\.gz
-}
-prog html2latex:HTML-Tagset = {
- version = 3.03
- url = http://www.cpan.org/modules/by-module/HTML/
- regex = HTML-Tagset-(__VER__)\.tar\.gz
-}
-prog html2latex:HTML-Tree = {
- version = 3.14
- url = http://www.cpan.org/modules/by-module/HTML/
- regex = HTML-Tree-(__VER__)\.tar\.gz
-}
-prog html2latex:XML-Parser = {
- version = 2.31
- url = http://www.cpan.org/modules/by-module/XML/
- regex = XML-Parser[.-](__VER__)\.tar\.gz
-}
-prog html2latex:XML-Simple = {
- version = 1.08
- url = http://www.cpan.org/modules/by-module/XML/
- regex = XML-Simple-(__VER__)\.tar\.gz
-}
Index: openpkg-src/html2latex/html2latex.spec
============================================================
$ cvs diff -u -r1.26 -r1.27 html2latex.spec
--- openpkg-src/html2latex/html2latex.spec 20 Oct 2002 07:22:18 -0000 1.26
+++ openpkg-src/html2latex/html2latex.spec 7 Nov 2002 20:18:20 -0000 1.27
@@ -23,14 +23,6 @@
## SUCH DAMAGE.
##
-%define V_html2latex 1.1
-%define V_html_parser 3.26
-%define V_html_tagset 3.03
-%define V_html_tree 3.14
-%define V_xml_parser 2.31
-%define V_xml_simple 1.08
-%define V_expat 1.95.5
-
# package information
Name: html2latex
Summary: HTML to LaTeX Conversion Tool
@@ -40,23 +32,17 @@
Distribution: OpenPKG [PLUS]
Group: Converter
License: GPL
-Version: %{V_html2latex}
-Release: 20021020
+Version: 1.1
+Release: 20021107
# list of sources
-Source0:
http://belnet.dl.sourceforge.net/sourceforge/html2latex/html2latex-%{V_html2latex}.tar.gz
-Source1:
http://www.cpan.org/modules/by-module/HTML/HTML-Parser-%{V_html_parser}.tar.gz
-Source2:
http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-%{V_html_tagset}.tar.gz
-Source3:
http://www.cpan.org/modules/by-module/HTML/HTML-Tree-%{V_html_tree}.tar.gz
-Source4:
http://www.cpan.org/modules/by-module/XML/XML-Parser-%{V_xml_parser}.tar.gz
-Source5:
http://www.cpan.org/modules/by-module/XML/XML-Simple-%{V_xml_simple}.tar.gz
-Source6:
http://belnet.dl.sourceforge.net/sourceforge/expat/expat-%{V_expat}.tar.gz
+Source0:
http://belnet.dl.sourceforge.net/sourceforge/html2latex/html2latex-%{version}.tar.gz
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl
-PreReq: OpenPKG, openpkg >= 20020206, perl
+BuildPreReq: OpenPKG, openpkg >= 20020206, perl, perl-xml >= 20021107
+PreReq: OpenPKG, openpkg >= 20020206, perl, perl-xml >= 20021107
AutoReq: no
AutoReqProv: no
@@ -65,109 +51,32 @@
formatted LaTeX file.
%prep
- %setup0 -q -c
- %setup1 -q -T -D -a 1
- %setup2 -q -T -D -a 2
- %setup3 -q -T -D -a 3
- %setup4 -q -T -D -a 4
- %setup5 -q -T -D -a 5
- %setup6 -q -T -D -a 6
+ %setup -q
%build
+ # no-op
%install
rm -rf $RPM_BUILD_ROOT
-
- # build Expat XML parser (for XML::Parser)
- ( cd expat-%{V_expat}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --disable-shared
- %{l_make} %{l_mflags}
- )
- expatdir=`pwd`/expat-%{V_expat}/lib
-
- # redirect Perl to temporary root
- perllibdir=$RPM_BUILD_ROOT%{l_prefix}/lib/perl5
- %{l_shtool} mkdir -f -p -m 755 $perllibdir
- eval `%{l_prefix}/bin/perl -V:version`
- eval `%{l_prefix}/bin/perl -V:archname`
- perl=$RPM_BUILD_ROOT/perl
- echo "#!/bin/sh" >$perl
- echo "exec %{l_prefix}/bin/perl \\" >>$perl
- echo " -I$perllibdir/$version \\" >>$perl
- echo " -I$perllibdir/$version/$archname \\" >>$perl
- echo " -I$perllibdir/site_perl \\" >>$perl
- echo " -I$perllibdir/site_perl/$version \\" >>$perl
- echo " -I$perllibdir/site_perl/$version/$archname \\" >>$perl
- echo " \"\$@\"" >>$perl
- chmod a+x $perl
-
- # install the prerequisite modules
- for module in \
- XML-Parser-%{V_xml_parser} \
- XML-Simple-%{V_xml_simple} \
- HTML-Tagset-%{V_html_tagset} \
- HTML-Parser-%{V_html_parser} \
- HTML-Tree-%{V_html_tree} \
- html2latex-%{V_html2latex}/HTML; do
- ( cd $module
- $perl Makefile.PL \
- PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
- PERL=$perl FULLPERL=$perl \
- EXPATLIBPATH=$expatdir/.libs \
- EXPATINCPATH=$expatdir
- %{l_make} %{l_mflags} PERL=$perl FULLPERL=$perl all
- %{l_make} %{l_mflags} PERL=$perl FULLPERL=$perl install
- )
- done
-
- # adjust Perl installation tree
- ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/perl5
- find . -type f -name ".packlist" -print | xargs rm -f
- find . -type f -name "perllocal.pod" -print | xargs rm -f
- )
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/lib/html2latex
- ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/$version/
- find . -depth -print | cpio -o ) |\
- ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/html2latex; cpio -idvmu )
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/html2latex/$archname
- ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/$version/$archname
- find . -depth -print | cpio -o ) |\
- ( cd $RPM_BUILD_ROOT%{l_prefix}/lib/html2latex; cpio -idvmu )
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/perl5
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
-
- # install driver
- ( cd html2latex-%{V_html2latex}
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man5
- ( echo "#!%{l_prefix}/bin/perl -w"
- echo "use lib \"%{l_prefix}/lib/html2latex\";"
- cat html2latex
- ) >html2latex.new
- %{l_shtool} install -c -m 755 \
- html2latex.new $RPM_BUILD_ROOT%{l_prefix}/bin/html2latex
- %{l_shtool} install -c -m 755 \
- html2latex.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
- %{l_prefix}/bin/pod2man HTML/Latex.pm >html2latex.conf.5
- %{l_shtool} install -c -m 755 \
- html2latex.conf.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
- )
-
- # determine file list
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std} \
- "%not %dir %{l_prefix}/lib/perl5" \
- "%not %dir %{l_prefix}/lib/perl5/$version" \
- "%not %dir %{l_prefix}/lib/perl5/$version/$archname" \
- "%not %dir %{l_prefix}/lib/perl5/site_perl" \
- "%not %dir %{l_prefix}/lib/perl5/site_perl/$version" \
- "%not %dir %{l_prefix}/lib/perl5/site_perl/$version/$archname"
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/html2latex/HTML \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man5
+ ( echo "#!%{l_prefix}/bin/perl -w"
+ echo "use lib \"%{l_prefix}/lib/html2latex\";"
+ cat html2latex
+ ) >html2latex.new
+ %{l_shtool} install -c -m 755 \
+ html2latex.new $RPM_BUILD_ROOT%{l_prefix}/bin/html2latex
+ %{l_shtool} install -c -m 755 \
+ html2latex.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_shtool} install -c -m 644 \
+ HTML/Latex.pm $RPM_BUILD_ROOT%{l_prefix}/lib/html2latex/HTML/
+ %{l_prefix}/bin/pod2man HTML/Latex.pm >html2latex.conf.5
+ %{l_shtool} install -c -m 755 \
+ html2latex.conf.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1964 -r1.1965 news.txt
--- openpkg-web/news.txt 7 Nov 2002 20:09:45 -0000 1.1964
+++ openpkg-web/news.txt 7 Nov 2002 20:18:19 -0000 1.1965
@@ -1,3 +1,4 @@
+07-Nov-2002: Upgraded package: P<html2latex-1.1-20021107>
07-Nov-2002: Upgraded package: P<perl-xml-20021107-20021107>
07-Nov-2002: Upgraded package: P<sa-1.0.1-20021107>
07-Nov-2002: Upgraded package: P<uvscan-4.1.6.4232-20021107>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
