OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Jun-2003 11:04:07
Branch: HEAD Handle: 2003060410040502
Modified files:
openpkg-src/docbook docbook.spec
openpkg-web news.txt
Log:
also support older docbook 4.1.2
Summary:
Revision Changes Path
1.52 +48 -17 openpkg-src/docbook/docbook.spec
1.4715 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/docbook/docbook.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 docbook.spec
--- openpkg-src/docbook/docbook.spec 23 May 2003 06:53:29 -0000 1.51
+++ openpkg-src/docbook/docbook.spec 4 Jun 2003 09:04:07 -0000 1.52
@@ -24,7 +24,11 @@
##
%define V_dtd_sgml 4.2
+%define V_dtd_sgml_old 4.1
+%define V_dtd_sgml_old_n 41
%define V_dtd_xml 4.2
+%define V_dtd_xml_old 4.1.2
+%define V_dtd_xml_old_n 412
%define V_dtd_simple 1.0
%define V_ss_dsssl 1.78
%define V_ss_xsl 1.61.2
@@ -39,17 +43,19 @@
Group: SGML
License: BSD
Version: 4.2
-Release: 20030523
+Release: 20030604
# list of sources
Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
-Source1:
http://www.oasis-open.org/docbook/xml/simple/%{V_dtd_simple}/docbook-simple-%{V_dtd_simple}.zip
-Source2:
http://www.oasis-open.org/docbook/sgml/%{V_dtd_sgml}/docbook-%{V_dtd_sgml}.zip
-Source3: http://fallout.campusview.indiana.edu/ports/distfiles/isoENTS.zip
-Source4:
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{V_ss_xsl}.tar.gz
-Source5:
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-%{V_ss_dsssl}.tar.gz
-Source6: isoENTS.catalog
-Source7: simple.catalog
+Source1:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml_old}/docbkx%{V_dtd_xml_old_n}.zip
+Source2:
http://www.oasis-open.org/docbook/xml/simple/%{V_dtd_simple}/docbook-simple-%{V_dtd_simple}.zip
+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
# build information
Prefix: %{l_prefix}
@@ -70,16 +76,22 @@
%prep
%setup -c -T
- for zip in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3}; do
+ for zip in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
base=`echo $zip | sed -e 's;^.*/\([^/]*\)\.zip$;\1;'`
mkdir $base
(cd $base; %{l_prefix}/bin/unzip -q -x $zip)
done
- for tgz in %{SOURCE4} %{SOURCE5}; do
- base=`echo $tgz | sed -e 's;^.*/\([^/]*\)\.tar.gz$;\1;'`
+ for tgz in %{SOURCE6} %{SOURCE7}; 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
@@ -97,7 +109,14 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-xml
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-xml/
- )
+ ) || exit $?
+ ( cd docbkx%{V_dtd_xml_old_n}
+ 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-old
+ cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-xml-old/
+ ) || exit $?
# install Simplified DocBook DTD
( cd docbook-simple-%{V_dtd_simple}
@@ -106,7 +125,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-simple
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-simple/
- )
+ ) || exit $?
# install DocBook SGML DTD
( cd docbook-%{V_dtd_sgml}
@@ -115,13 +134,20 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-sgml
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-sgml/
- )
+ ) || exit $?
+ ( cd docbk%{V_dtd_sgml_old_n}
+ mv docbook.cat catalog
+ rm -f ChangeLog README
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-sgml-old
+ cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-sgml-old/
+ ) || exit $?
( cd isoENTS
cp %{SOURCE isoENTS.catalog} catalog
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/sgml/iso8879-sgml
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/iso8879-sgml/
- )
+ ) || exit $?
# install DocBook XSL Stylesheets (for XML)
( cd docbook-xsl-%{V_ss_xsl}
@@ -130,10 +156,11 @@
find . -name ChangeLog -print | xargs rm -f
find . -name "*.bak" -print | xargs rm -f
find . -name README -print | xargs rm -f
+ rm -f fo/pdf2index
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-ss-xsl
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-ss-xsl/
- )
+ ) || exit $?
# install DocBook DSSSL Stylesheets (for SGML)
( cd docbook-dsssl-%{V_ss_dsssl}
@@ -145,7 +172,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-ss-dsssl
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-ss-dsssl/
- )
+ ) || exit $?
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ -160,8 +187,10 @@
if [ $1 -eq 1 ]; then
$RPM_INSTALL_PREFIX/bin/mkcatalog -q install iso8879-sgml
$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-xml
+ $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-xml-old
$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-simple
$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml
+ $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml-old
$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-ss-dsssl
fi
@@ -169,8 +198,10 @@
if [ $1 -eq 0 ]; then
$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall iso8879-sgml
$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-xml
+ $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-xml-old
$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-simple
$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-sgml
+ $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-sgml-old
$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-ss-dsssl
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4714 -r1.4715 news.txt
--- openpkg-web/news.txt 4 Jun 2003 08:27:56 -0000 1.4714
+++ openpkg-web/news.txt 4 Jun 2003 09:04:05 -0000 1.4715
@@ -1,3 +1,4 @@
+04-Jun-2003: Upgraded package: P<docbook-4.2-20030604>
04-Jun-2003: Upgraded package: P<vim-6.2.11-20030604>
04-Jun-2003: Upgraded package: P<dss-4.1.3-20030604>
03-Jun-2003: New package: P<xmlsec-1.0.2-20030603>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
