[arch-commits] Commit in docbook-xsl/trunk (PKGBUILD docbook-xsl.install)

[Antonio Rojas]

    Date: Thursday, July 6, 2017 @ 18:17:52
  Author: arojas
Revision: 299769

Use non-namespaced sources (FS#54723), update URL in install file

Modified:
  docbook-xsl/trunk/PKGBUILD
  docbook-xsl/trunk/docbook-xsl.install

---------------------+
 PKGBUILD            |   10 +++++-----
 docbook-xsl.install |   18 ++++++++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-06 15:32:01 UTC (rev 299768)
+++ PKGBUILD	2017-07-06 18:17:52 UTC (rev 299769)
@@ -7,7 +7,7 @@
 
 pkgname=docbook-xsl
 pkgver=1.79.2
-pkgrel=2
+pkgrel=3
 pkgdesc='XML stylesheets for Docbook-xml transformations'
 arch=(any)
 license=(custom)
@@ -14,18 +14,18 @@
 url='http://docbook.org/'
 depends=(libxml2 libxslt docbook-xml)
 install="$pkgname.install"
-source=("https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz"
+source=("https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-nons-$pkgver.tar.gz"
         765567_non-recursive_string_subst.patch)
-sha256sums=('966188d7c05fc76eaca115a55893e643dd01a3486f6368733c9ad974fcee7a26'
+sha256sums=('f89425b44e48aad24319a2f0d38e0cb6059fdc7dbaf31787c8346c748175ca8e'
             '193ec26dcb37bdf12037ed4ea98d68bd550500c8e96b719685d76d7096c3f9b3')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname-nons-$pkgver
   patch -Np2 -i ../765567_non-recursive_string_subst.patch
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname-nons-$pkgver
 
   _pkgroot="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver
 

Modified: docbook-xsl.install
===================================================================
--- docbook-xsl.install	2017-07-06 15:32:01 UTC (rev 299768)
+++ docbook-xsl.install	2017-07-06 18:17:52 UTC (rev 299769)
@@ -5,19 +5,29 @@
   _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
 
   xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "http://cdn.docbook.org/release/xsl/${_NEW}" \
     "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
     etc/xml/catalog
 
   xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "http://cdn.docbook.org/release/xsl/${_NEW}" \
     "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog &&
+    etc/xml/catalog
 
   xmlcatalog --noout --add "rewriteSystem" \
+    "http://cdn.docbook.org/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+  xmlcatalog --noout --add "rewriteURI" \
+    "http://cdn.docbook.org/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+  xmlcatalog --noout --add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/current" \
     "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog &&
+    etc/xml/catalog
 
   xmlcatalog --noout --add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/current" \