OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Apr-2004 17:07:11
Branch: HEAD Handle: 2004040116071100
Modified files:
openpkg-src/docbook docbook.spec
Log:
include new DocBook 4.3 stuff; remove no longer necessary hack
Summary:
Revision Changes Path
1.73 +16 -14 openpkg-src/docbook/docbook.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/docbook/docbook.spec
============================================================================
$ cvs diff -u -r1.72 -r1.73 docbook.spec
--- openpkg-src/docbook/docbook.spec 9 Mar 2004 19:06:02 -0000 1.72
+++ openpkg-src/docbook/docbook.spec 1 Apr 2004 15:07:11 -0000 1.73
@@ -27,6 +27,7 @@
%define V_dtd_sgml 4.2
%define V_dtd_sgml_old 4.1
%define V_dtd_sgml_old_n 41
+%define V_dtd_xml_new 4.3
%define V_dtd_xml 4.2
%define V_dtd_xml_old 4.1.2
%define V_dtd_xml_old_n 412
@@ -45,7 +46,7 @@
Group: SGML
License: BSD
Version: 4.2
-Release: 20040309
+Release: 20040401
# list of sources
Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
@@ -54,10 +55,11 @@
Source3:
http://www.oasis-open.org/docbook/sgml/%{V_dtd_sgml}/docbook-%{V_dtd_sgml}.zip
Source4:
http://www.oasis-open.org/docbook/sgml/%{V_dtd_sgml_old}/docbk%{V_dtd_sgml_old_n}.zip
Source5: http://fallout.campusview.indiana.edu/ports/distfiles/isoENTS.zip
-Source6:
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{V_ss_xsl}.tar.gz
-Source7:
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-%{V_ss_dsssl}.tar.gz
-Source8: isoENTS.catalog
-Source9: simple.catalog
+Source6:
http://docbook.org/xml/%{V_dtd_xml_new}/docbook-xml-%{V_dtd_xml_new}.zip
+Source7:
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{V_ss_xsl}.tar.gz
+Source8:
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-%{V_ss_dsssl}.tar.gz
+Source9: isoENTS.catalog
+Source10: simple.catalog
# build information
Prefix: %{l_prefix}
@@ -105,22 +107,15 @@
%prep
%setup -c -T
- for zip in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
+ for zip in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
%{SOURCE6}; do
base=`echo $zip | sed -e 's;^.*/\([^/]*\)\.zip$;\1;'`
mkdir $base
( cd $base; %{l_prefix}/bin/unzip -q -x $zip ) || exit $?
done
- for tgz in %{SOURCE6} %{SOURCE7}; do
+ for tgz in %{SOURCE7} %{SOURCE8}; do
%{l_gzip} -d -c $tgz | %{l_tar} -xf -
done
- # fix broken XSL stylesheet in 1.61.1
- base=`echo %{SOURCE6} | sed -e 's;^.*/\([^/]*\)\.tar.gz$;\1;'`
- cd $base
- %{l_shtool} subst \
- -e 's;<xsl:include href="axf.xsl"/>;;' \
- fo/docbook.xsl
-
%build
%install
@@ -132,6 +127,13 @@
$RPM_BUILD_ROOT%{l_prefix}/share/sgml
# install DocBook XML DTD
+ ( cd docbook-xml-%{V_dtd_xml_new}
+ mv docbook.cat catalog
+ rm -f ChangeLog README
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-xml-new
+ cp -r * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-xml-new/
+ ) || exit $?
( cd docbook-xml-%{V_dtd_xml}
mv docbook.cat catalog
rm -f ChangeLog README
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
