Stefan Fiedler: docbook-{oasis,xsl}: change install location (for KDE4) --- package/public/docbook-oasis/docbook-oasis.conf (revision 230) +++ package/public/docbook-oasis/docbook-oasis.conf (revision 231) @@ -1,9 +1,10 @@ docbook_xsl_main() { - mkdir -p $root/usr/share/xml/docbook-oasis-$ver - ( cd $root/usr/share/xml/docbook-oasis-$ver && unzip $archdir/*; ) - echo "export XML_CATALOG_FILES=\"\$XML_CATALOG_FILES\${XML_CATALOG_FILES:+ }/usr/share/xml/docbook-oasis-$ver/catalog.xml\"" > $root/etc/profile.d/$xpkg + local docbookdir=/usr/share/xml/docbook/xml-dtd-$ver + mkdir -p $root/$docbookdir + ( cd $root/$docbookdir && unzip $archdir/*; ) + echo "export XML_CATALOG_FILES=\"\$XML_CATALOG_FILES\${XML_CATALOG_FILES:+ }$docbookdir/catalog.xml\"" > $root/etc/profile.d/$xpkg $root/etc/xml/update_catalog.sh } --- package/public/docbook-oasis/preconfig.in (revision 230) +++ package/public/docbook-oasis/preconfig.in (revision 231) @@ -1,4 +1,4 @@ -for x in docbook-oasis-{4.1,4.2,4.3} ; do +for x in docbook-oasis-{4.1,4.2,4.3,4.4} ; do pkgfork docbook-oasis $x done --- package/public/docbook-oasis/docbook-oasis.desc (revision 230) +++ package/public/docbook-oasis/docbook-oasis.desc (revision 231) @@ -51,6 +51,10 @@ [V] 4.3 [D] 2215791483 docbook-xml-4.3.zip http://www.oasis-open.org/docbook/xml/4.3/ #endif +#if xpkg == docbook-oasis-4.4 +[V] 4.4 +[D] 0 docbook-xml-4.4.zip http://www.oasis-open.org/docbook/xml/4.4/ +#endif [P] X --?--5---9 109.730 --- package/public/docbook-xsl/docbook-xsl.conf (revision 230) +++ package/public/docbook-xsl/docbook-xsl.conf (revision 231) @@ -1,10 +1,12 @@ docbook_xsl_main() { - mkdir -p $root/usr/share/xml + local docbookdir=/usr/share/xml/docbook/xsl-stylesheets + + mkdir -p $root/$docbookdir rm -rf $root/etc/xml/docbook-xsl - cp -av . $root/usr/share/xml/`cat $builddir/xsrcdir.txt` - echo "export XML_CATALOG_FILES=\"\$XML_CATALOG_FILES\${XML_CATALOG_FILES:+ }/usr/share/xml/`cat $builddir/xsrcdir.txt`/catalog.xml\"" > $root/etc/profile.d/docbook-xsl + cp -av . $root/$docbookdir + echo "export XML_CATALOG_FILES=\"\$XML_CATALOG_FILES\${XML_CATALOG_FILES:+ }/$docbookdir/catalog.xml\"" > $root/etc/profile.d/docbook-xsl $root/etc/xml/update_catalog.sh }