From 3c7826010c22c8fc6947d0f2a3f326cc5fe1891f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Aug 2007 17:09:16 +0000
Subject: [PATCH] * Docbook XSL NS 1.73.0.

svn path=/nixpkgs/trunk/; revision=9126
---
 .../stylesheets/xslt/docbook5/builder.sh        |  2 +-
 .../stylesheets/xslt/docbook5/default.nix       |  7 +++----
 .../stylesheets/xslt/docbook5/link-href.patch   | 17 -----------------
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook5/link-href.patch

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh
index 47414291a740..889886b3cb24 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh
@@ -6,7 +6,7 @@ installPhase=myInstallPhase
 myInstallPhase() {
     ensureDir $out/xml/xsl
     cd ..
-    mv docbook5-xsl-* $out/xml/xsl/docbook
+    mv docbook-xsl-ns-* $out/xml/xsl/docbook
 }
 
 genericBuild
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix
index 67397affa074..868217707658 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "docbook5-xsl-1.72.0";
+  name = "docbook5-xsl-1.73.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/docbook/docbook5-xsl-1.72.0.tar.bz2;
-    sha256 = "0iy7axmk3nvaqgxg5lh7qx39ad9g3qrgwikrp5w4z7bwlrpijfpx";
+    url = http://kent.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-ns-1.73.0.tar.bz2;
+    sha256 = "1ldg8jqbwqy2il7ghvyv49nn45n9aj0l5w5l04sh305z6bww67nk";
   };
-  patches = [./link-href.patch];
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/link-href.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/link-href.patch
deleted file mode 100644
index 7ba99c5410c2..000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/link-href.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rc docbook5-xsl-1.72.0-orig/html/xref.xsl docbook5-xsl-1.72.0/html/xref.xsl
-*** docbook5-xsl-1.72.0-orig/html/xref.xsl	2007-01-23 21:50:22.000000000 +0100
---- docbook5-xsl-1.72.0/html/xref.xsl	2007-02-05 12:53:50.000000000 +0100
-***************
-*** 898,903 ****
---- 898,908 ----
-          <!-- If it has content, use it -->
-          <xsl:apply-templates/>
-        </xsl:when>
-+       <xsl:when test="@xlink:href">
-+         <a href="@xlink:href">
-+           <xsl:value-of select="@xlink:href"/>
-+         </a>
-+       </xsl:when>
-        <xsl:otherwise>
-          <!-- else look for an endterm -->
-          <xsl:choose>