OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 18-Jul-2002 09:29:43
Branch: HEAD Handle: 197001010100001026973783
Modified files:
openpkg-re/vcheck vc.docbook
openpkg-src/docbook docbook.spec
openpkg-web news.txt
Removed files:
openpkg-src/docbook docbk41.catalog
Log:
upgrading package: docbook 4.1 -> 4.2
Summary:
Revision Changes Path
1.10 +8 -8 openpkg-re/vcheck/vc.docbook
NONE +0 -63 openpkg-src/docbook/docbk41.catalog
1.28 +17 -23 openpkg-src/docbook/docbook.spec
1.980 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.docbook
============================================================
$ cvs diff -u -r1.9 -r1.10 vc.docbook
--- openpkg-re/vcheck/vc.docbook 11 Jul 2002 07:31:56 -0000 1.9
+++ openpkg-re/vcheck/vc.docbook 18 Jul 2002 07:29:42 -0000 1.10
@@ -1,15 +1,15 @@
config = {
}
-prog docbook:docbk = {
- version = 41
- url = http://www.oasis-open.org/docbook/sgml/4.1/
- regex = docbk(__VER__)\.zip
+prog docbook:docbook-sgml = {
+ version = 4.2
+ url = http://www.oasis-open.org/docbook/sgml/4.2/
+ regex = docbook-(__VER__)\.zip
}
-prog docbook:docbkx = {
- version = 412
- url = http://www.oasis-open.org/docbook/xml/4.1.2/
- regex = docbkx(__VER__)\.zip
+prog docbook:docbook-xml = {
+ version = 4.2
+ url = http://www.oasis-open.org/docbook/xml/4.2/
+ regex = docbook-xml-(__VER__)\.zip
}
prog docbook:docbook-dsssl = {
version = 1.77
Index: openpkg-src/docbook/docbook.spec
============================================================
$ cvs diff -u -r1.27 -r1.28 docbook.spec
--- openpkg-src/docbook/docbook.spec 11 Jul 2002 07:31:58 -0000 1.27
+++ openpkg-src/docbook/docbook.spec 18 Jul 2002 07:29:43 -0000 1.28
@@ -23,12 +23,10 @@
## SUCH DAMAGE.
##
-%define V_dtd_xml_l 4.1.2
-%define V_dtd_xml_s 412
-%define V_dtd_sgml_l 4.1
-%define V_dtd_sgml_s 41
-%define V_ss_xsl 1.52.2
-%define V_ss_dsssl 1.77
+%define V_dtd_sgml 4.2
+%define V_dtd_xml 4.2
+%define V_ss_dsssl 1.77
+%define V_ss_xsl 1.52.2
# package information
Name: docbook
@@ -39,17 +37,16 @@
Distribution: OpenPKG [EXP]
Group: SGML
License: BSD
-Version: 4.1
-Release: 20020711
+Version: 4.2
+Release: 20020718
# list of sources
-Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml_l}/docbkx%{V_dtd_xml_s}.zip
-Source1:
http://www.oasis-open.org/docbook/sgml/%{V_dtd_sgml_l}/docbk%{V_dtd_sgml_s}.zip
+Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
+Source1:
http://www.oasis-open.org/docbook/sgml/%{V_dtd_sgml}/docbook-%{V_dtd_sgml}.zip
Source2: http://fallout.campusview.indiana.edu/ports/distfiles/isoENTS.zip
Source3:
http://belnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{V_ss_xsl}.tar.gz
Source4:
http://belnet.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-%{V_ss_dsssl}.tar.gz
Source5: isoENTS.catalog
-Source6: docbk41.catalog
# build information
Prefix: %{l_prefix}
@@ -94,19 +91,18 @@
$RPM_BUILD_ROOT%{l_prefix}/share/sgml
# install DocBook XML DTD
- ( cd docbkx%{V_dtd_xml_s}
+ ( cd docbook-xml-%{V_dtd_xml}
mv docbook.cat catalog
- rm -f *.txt ChangeLog
+ rm -f ChangeLog README
%{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/
)
# install DocBook SGML DTD
- ( cd docbk%{V_dtd_sgml_s}
- rm -f docbook.cat
- rm -f *.txt ChangeLog
- cp %{SOURCE docbk41.catalog} catalog
+ ( cd docbook-%{V_dtd_sgml}
+ 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
cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-sgml/
@@ -122,9 +118,8 @@
# install DocBook XSL Stylesheets (for XML)
( cd docbook-xsl-%{V_ss_xsl}
- # rm -f [A-Z]*
- rm -rf extensions
- rm -rf doc docsrc
+ rm -f [A-Z]*
+ rm -rf extensions doc docsrc
find . -name ChangeLog -print | xargs rm -f
find . -name "*.bak" -print | xargs rm -f
find . -name README -print | xargs rm -f
@@ -135,9 +130,8 @@
# install DocBook DSSSL Stylesheets (for SGML)
( cd docbook-dsssl-%{V_ss_dsssl}
- # rm -f [A-Z]*
- rm -rf bin
- rm -rf doc docsrc
+ rm -f [A-Z]*
+ rm -rf bin doc docsrc debian
find . -name ChangeLog -print | xargs rm -f
find . -name "*.bak" -print | xargs rm -f
find . -name README -print | xargs rm -f
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.979 -r1.980 news.txt
--- openpkg-web/news.txt 18 Jul 2002 07:28:31 -0000 1.979
+++ openpkg-web/news.txt 18 Jul 2002 07:29:42 -0000 1.980
@@ -1,3 +1,4 @@
+18-Jul-2002: Upgraded package: P<docbook-4.2-20020718>
18-Jul-2002: Upgraded package: P<sqlite-2.6.0-20020718>
18-Jul-2002: Upgraded package: P<readline-4.3-20020718>
18-Jul-2002: Upgraded package: P<gettext-0.11.3-20020718>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]