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 openpkg-web openpkg$ Date:   16-Jan-2003 11:30:56
  Branch: HEAD                             Handle: 2003011610305302

  Added files:
    openpkg-src/docbook     simple.catalog
  Modified files:
    openpkg-re/vcheck       vc.docbook
    openpkg-src/docbook     docbook.spec
    openpkg-web             news.txt

  Log:
    add new Simplified Docbook XML DTD

  Summary:
    Revision    Changes     Path
    1.18        +5  -0      openpkg-re/vcheck/vc.docbook
    1.44        +25 -17     openpkg-src/docbook/docbook.spec
    1.1         +13 -0      openpkg-src/docbook/simple.catalog
    1.2852      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.docbook
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 vc.docbook
  --- openpkg-re/vcheck/vc.docbook      13 Jan 2003 18:57:53 -0000      1.17
  +++ openpkg-re/vcheck/vc.docbook      16 Jan 2003 10:30:53 -0000      1.18
  @@ -11,6 +11,11 @@
     url       = http://www.oasis-open.org/docbook/xml/4.2/
     regex     = docbook-xml-(__VER__)\.zip
   }
  +prog docbook:docbook-simple = {
  +  version   = 1.0
  +  url       = http://www.oasis-open.org/docbook/xml/simple/1.0/
  +  regex     = docbook-simple-(__VER__)\.zip
  +}
   prog docbook:docbook-dsssl = {
     version   = 1.77
     url       = http://prdownloads.sourceforge.net/docbook/
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/docbook/docbook.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 docbook.spec
  --- openpkg-src/docbook/docbook.spec  13 Jan 2003 18:57:53 -0000      1.43
  +++ openpkg-src/docbook/docbook.spec  16 Jan 2003 10:30:55 -0000      1.44
  @@ -25,6 +25,7 @@
   
   %define       V_dtd_sgml       4.2
   %define       V_dtd_xml        4.2
  +%define       V_dtd_simple     1.0
   %define       V_ss_dsssl       1.77
   %define       V_ss_xsl         1.59.1
   
  @@ -38,15 +39,17 @@
   Group:        SGML
   License:      BSD
   Version:      4.2
  -Release:      20030113
  +Release:      20030116
   
   #   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/sgml/%{V_dtd_sgml}/docbook-%{V_dtd_sgml}.zip
  -Source2:      http://fallout.campusview.indiana.edu/ports/distfiles/isoENTS.zip
  -Source3:      
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{V_ss_xsl}.tar.gz
  -Source4:      
http://osdn.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-%{V_ss_dsssl}.tar.gz
  -Source5:      isoENTS.catalog
  +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
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -66,26 +69,23 @@
       SGML/DSSSL and XML/XSL only.
   
   %prep
  -    rm -rf docbook-%{version}
  -    mkdir docbook-%{version}
  -    cd docbook-%{version}
  -    for zip in %{SOURCE0} %{SOURCE1} %{SOURCE2}; do
  +    %setup -c
  +    for zip in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3}; do
           base=`echo $zip | sed -e 's;^.*/\([^/]*\)\.zip$;\1;'`
           mkdir $base
           (cd $base; %{l_prefix}/bin/unzip -q -x $zip)
       done
  -    for tgz in %{SOURCE3} %{SOURCE4}; do
  +    for tgz in %{SOURCE4} %{SOURCE5}; do
           base=`echo $tgz | sed -e 's;^.*/\([^/]*\)\.tar.gz$;\1;'`
           %{l_gzip} -d -c $tgz | %{l_tar} -xf -
       done
   
   %build
  -    :
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    cd docbook-%{version}
   
  +    #   create installation hierarchy
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/share/sgml
  @@ -99,6 +99,15 @@
         cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-xml/
       )
   
  +    #   install Simplified DocBook DTD
  +    ( cd docbook-simple-%{V_dtd_simple}
  +      cp %{SOURCE simple.catalog} catalog
  +      rm -f ChangeLog README
  +      %{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/
  +    )
  +
       #   install DocBook SGML DTD
       ( cd docbook-%{V_dtd_sgml}
         mv docbook.cat catalog
  @@ -108,12 +117,10 @@
         cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-dtd-sgml/
       )
       ( 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/
  -      %{l_shtool} install -c -m 644 \
  -          %{SOURCE isoENTS.catalog} \
  -          $RPM_BUILD_ROOT%{l_prefix}/share/sgml/iso8879-sgml/catalog
       )
   
       #   install DocBook XSL Stylesheets (for XML)
  @@ -140,7 +147,6 @@
         cp -rp * $RPM_BUILD_ROOT%{l_prefix}/share/sgml/docbook-ss-dsssl/
       )
   
  -    cd ..
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%not %dir %{l_prefix}/share/sgml'
  @@ -154,6 +160,7 @@
       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-simple
           $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml
           $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-ss-dsssl
       fi
  @@ -162,6 +169,7 @@
       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-simple
           $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-sgml
           $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-ss-dsssl
       fi
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/docbook/simple.catalog
  ============================================================================
  $ cvs diff -u -r0 -r1.1 simple.catalog
  --- /dev/null 2003-01-16 11:30:56.000000000 +0100
  +++ simple.catalog    2003-01-16 11:30:56.000000000 +0100
  @@ -0,0 +1,13 @@
  +
  +PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
  +       "sdocbook-custom.dtd"
  +
  +PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
  +       "sdocbook.dtd"
  +
  +PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
  +       "sdocbookref-custom.dtd"
  +
  +PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN"
  +       "sdocbookref.dtd"
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.2851 -r1.2852 news.txt
  --- openpkg-web/news.txt      16 Jan 2003 09:50:02 -0000      1.2851
  +++ openpkg-web/news.txt      16 Jan 2003 10:30:54 -0000      1.2852
  @@ -1,3 +1,4 @@
  +16-Jan-2003: Upgraded package: P<docbook-4.2-20030116>
   16-Jan-2003: Upgraded package: P<dhcpd-3.0.1rc11-20030116>
   16-Jan-2003: Upgraded package: P<uvscan-4.1.6.4243-20030116>
   16-Jan-2003: Upgraded package: P<openssh-3.5p1-20030115>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to