package Relax NG schema format (#839665), package W3C XML (XSD) schema format

.gitignore

@@ -11,3 +11,11 @@ docbook-4.4.zip
 docbook-xml-4.4.zip
 docbook-4.5.zip
 docbook-xml-4.5.zip
+/docbook-rng-4.2.zip
+/docbook-rng-4.3.zip
+/docbook-rng-4.4.zip
+/docbook-rng-4.5.zip
+/docbook-xsd-4.2.zip
+/docbook-xsd-4.3.zip
+/docbook-xsd-4.4.zip
+/docbook-xsd-4.5.zip

docbook-dtds.spec

@@ -1,10 +1,11 @@
 %global openjadever 1.3.2
-%global version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}"
+%global version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml} 4.{2,3,4,5}-rng 4.{2,3,4,5}-xsd"
+%global catalog_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}"
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name: docbook-dtds
 Version: 1.0
-Release: 61%{?dist}
+Release: 62%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -17,7 +18,6 @@ Obsoletes: docbook-dtd31-sgml < %{version}-%{release}
 Obsoletes: docbook-dtd40-sgml < %{version}-%{release}
 Obsoletes: docbook-dtd41-sgml < %{version}-%{release}
 Obsoletes: docbook-dtd412-xml < %{version}-%{release}
-
 Provides: docbook-dtd-xml = %{version}-%{release}
 Provides: docbook-dtd-sgml = %{version}-%{release}
 Provides: docbook-dtd30-sgml = %{version}-%{release}
@@ -58,6 +58,16 @@ Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip
 Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
 Source11: http://www.docbook.org/sgml/4.5/docbook-4.5.zip
 Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
+Source13: http://www.docbook.org/rng/4.2/docbook-rng-4.2.zip
+Source14: http://www.docbook.org/rng/4.3/docbook-rng-4.3.zip
+Source15: http://www.docbook.org/rng/4.4/docbook-rng-4.4.zip
+#compressed from http://www.docbook.org/rng/4.5/ upstream archive unavailable
+Source16: docbook-rng-4.5.zip
+Source17: http://www.docbook.org/xsd/4.2/docbook-xsd-4.2.zip
+Source18: http://www.docbook.org/xsd/4.3/docbook-xsd-4.3.zip
+Source19: http://www.docbook.org/xsd/4.4/docbook-xsd-4.4.zip
+#compressed from http://www.docbook.org/xsd/4.5/ upstream archive unavailable
+Source20: docbook-xsd-4.5.zip
 #fix old catalog files
 Patch0: docbook-dtd30-sgml-1.0.catalog.patch
 Patch1: docbook-dtd31-sgml-1.0.catalog.patch
@@ -154,6 +164,46 @@ cd 4.5-xml
 unzip %{SOURCE12}
 cd ..
 
+# Docbook RNG v4.2
+cd 4.2-rng
+unzip %{SOURCE13}
+cd ..
+
+# Docbook RNG v4.3
+cd 4.3-rng
+unzip %{SOURCE14}
+cd ..
+
+# Docbook RNG v4.4
+cd 4.4-rng
+unzip %{SOURCE15}
+cd ..
+
+# Docbook RNG v4.5
+cd 4.5-rng
+unzip %{SOURCE16}
+cd ..
+
+# Docbook XSD v4.2
+cd 4.2-xsd
+unzip %{SOURCE17}
+cd ..
+
+# Docbook XSD v4.3
+cd 4.3-xsd
+unzip %{SOURCE18}
+cd ..
+
+# Docbook XSD v4.4
+cd 4.4-xsd
+unzip %{SOURCE19}
+cd ..
+
+# Docbook XSD v4.5
+cd 4.5-xsd
+unzip %{SOURCE20}
+cd ..
+
 # Fix &euro; in SGML.
 %patch5 -p1
 
@@ -197,11 +247,27 @@ for dir
 do
   cd $dir
   fmt=${dir#*-} ver=${dir%%-*}
-  DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver
+  case $fmt in
+    sgml)   DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
+    xml)    DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
+    rng)    DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;;
+    xsd)    DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;;
+  esac
   case $fmt in
     sgml)   mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
     xml)    mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
+    rng)    mkdir -p $DESTDIR ; install *.r* $DESTDIR ;;
+    xsd)    mkdir -p $DESTDIR ; install *.xsd $DESTDIR;;
   esac
+  cd ..
+done
+
+eval set %{catalog_list}
+for dir
+do
+  cd $dir
+  fmt=${dir#*-} ver=${dir%%-*}
+  DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver
   install *.dtd *.mod $DESTDIR
   install docbook.cat $DESTDIR/catalog
   cd ..
@@ -209,7 +275,6 @@ do
   touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$ver.cat
 done
 
-
 #workaround the missing support for --parents hack in rpm 4.11+
 mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}
 for i in */*.txt */ChangeLog */README
@@ -227,10 +292,11 @@ rm -rf $RPM_BUILD_ROOT
 #but they don't need to be, 0644 is enough for every file in tarball
 %{_pkgdocdir}
 /usr/share/sgml/docbook/*ml-dtd-*
+/usr/share/sgml/docbook/rng-*
+/usr/share/sgml/docbook/xsd-*
 %config(noreplace) /etc/sgml/*ml-docbook.cat
 %ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat
 
-
 %post
 catcmd='/usr/bin/xmlcatalog --noout'
 xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
@@ -251,7 +317,7 @@ for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done
 case $STYLESHEETS in
   *-"*") STYLESHEETS= ;;
 esac
-eval set %{version_list}
+eval set %{catalog_list}
 for dir
 do
   fmt=${dir#*-} ver=${dir%%-*}
@@ -362,7 +428,7 @@ ent/iso-lat2.ent
 ent/iso-amsr.ent
 ent/iso-cyr2.ent
   "
-  eval set %{version_list}
+  eval set %{catalog_list}
   for dir
   do
     fmt=${dir#*-} ver=${dir%%-*}
@@ -393,7 +459,7 @@ ent/iso-cyr2.ent
 fi
 
 %triggerin -- openjade >= %{openjadever}
-eval set %{version_list}
+eval set %{catalog_list}
 for dir
 do
   fmt=${dir#*-} ver=${dir%%-*}
@@ -403,7 +469,7 @@ done
 
 %triggerun -- openjade >= %{openjadever}
 [ $2 = 0 ] || exit 0
-eval set %{version_list}
+eval set %{catalog_list}
 for dir
 do
   fmt=${dir#*-} ver=${dir%%-*}
@@ -412,6 +478,10 @@ do
 done
 
 %changelog
+* Mon Aug 19 2013 Ondrej Vasik <ovasik@redhat.com> - 1.0-62
+- package Relax NG schema format (#839665)
+- package W3C XML (XSD) schema format
+
 * Tue Aug 06 2013 Ondrej Vasik <ovasik@redhat.com> - 1.0-61
 - use pkgdocdir variable when available (#993727)
 

sources

@@ -11,3 +11,11 @@ f89e1bd0b2c7a361e3f1f739e16b5d0d  docbook-4.4.zip
 cbb04e9a700955d88c50962ef22c1634  docbook-xml-4.4.zip
 07c581f4bbcba6d3aac85360a19f95f7  docbook-4.5.zip
 03083e288e87a7e829e437358da7ef9e  docbook-xml-4.5.zip
+5665912ecd67d54fdbf73beee1c6560a  docbook-rng-4.2.zip
+87b8f2a86c9639e137383a00188495a6  docbook-rng-4.3.zip
+a16c91da0426c9a1daebcced244957e2  docbook-rng-4.4.zip
+ba73c9a17714983963a6e36e5ac269f2  docbook-rng-4.5.zip
+15b32fd8278078bf12e84822a8149e65  docbook-xsd-4.2.zip
+6a9f1d391bf291cda8ce5746f51700d8  docbook-xsd-4.3.zip
+8dfb5936a16c81514be05abd00b756af  docbook-xsd-4.4.zip
+c0d81ae70515a95f7568a40dfcedcfbc  docbook-xsd-4.5.zip