From 85ff50fe4a5998312a88fd7eef3f15d98b761fe2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 17 Sep 2009 05:18:19 +0000
Subject: [PATCH] Make a safer version of default versionReferenceCreator in
 upstream data updater; use yet another version reference creator in xneur;
 check in correct URL for it

svn path=/nixpkgs/trunk/; revision=17211
---
 pkgs/applications/misc/xneur/src-for-default.nix            | 2 +-
 pkgs/applications/misc/xneur/src-info-for-default.nix       | 1 +
 pkgs/build-support/upstream-updater/update-upstream-data.sh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix
index 61c20718b378..71090a58b528 100644
--- a/pkgs/applications/misc/xneur/src-for-default.nix
+++ b/pkgs/applications/misc/xneur/src-for-default.nix
@@ -2,7 +2,7 @@ rec {
    version="0.9.6";
    name="xneur-0.9.6";
    hash="0xxyj2w5ckk2pnqsx853zgs6s2lq1cb101px472rccpixcbdfs47";
-   url="http://dists.xneur.ru/release-0.9.6.6/tgz/xneur-0.9.6.tar.bz2";
+   url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
    advertisedUrl="http://dists.xneur.ru/release-0.9.6/tgz/xneur-0.9.6.tar.bz2";
   
   
diff --git a/pkgs/applications/misc/xneur/src-info-for-default.nix b/pkgs/applications/misc/xneur/src-info-for-default.nix
index fbc8100b94fd..b0788bc641c5 100644
--- a/pkgs/applications/misc/xneur/src-info-for-default.nix
+++ b/pkgs/applications/misc/xneur/src-info-for-default.nix
@@ -1,4 +1,5 @@
 {
   downloadPage = "http://xneur.ru/wiki/Downloads";
   baseName = "xneur";
+  versionReferenceCreator = "$(replaceAllVersionOccurences)";
 }
diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh
index dfdb74e363fa..b3e0bbe6d30a 100755
--- a/pkgs/build-support/upstream-updater/update-upstream-data.sh
+++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh
@@ -52,7 +52,7 @@ prefetchClause=""
     
     mirrorUrl="$(echo "$freshUrl" | 
       eval "sed -r -e \"$(getAttr versionReferenceCreator \
-        's/-([0-9.]+)[.]/-${version}./')\"" |
+        's/-'"${version}"'[.]/-\${version}./')\"" |
       eval "sed -r -e \"$(getAttr mirrorSedScript)\"")"
     url="$mirrorUrl"