upgrading package: docbook 4.1 -> 4.2

docbook/docbook.spec

@@ -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 @@ Packager:     The OpenPKG Project
 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 @@ AutoReqProv:  no
         $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 @@ AutoReqProv:  no
 
     #   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 @@ AutoReqProv:  no
 
     #   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