From ef399d05679da2722e3ab27c7392e648edb76522 Mon Sep 17 00:00:00 2001
From: Ronny Schmatzler <schmatzler@hirnschwund.net>
Date: Mon, 18 Aug 2014 23:13:35 +0700
Subject: development/newtonsoft-json: Updated for version 6.0.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/newtonsoft-json/newtonsoft-json.SlackBuild | 10 ++++++----
 development/newtonsoft-json/newtonsoft-json.info       |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'development')

diff --git a/development/newtonsoft-json/newtonsoft-json.SlackBuild b/development/newtonsoft-json/newtonsoft-json.SlackBuild
index 0ca809a82c..4545fed4d9 100644
--- a/development/newtonsoft-json/newtonsoft-json.SlackBuild
+++ b/development/newtonsoft-json/newtonsoft-json.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=newtonsoft-json
-VERSION=${VERSION:-6.0.3}
+VERSION=${VERSION:-6.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -94,8 +94,10 @@ cd Src/Newtonsoft.Json/bin/Release/Net45
 rm *.{xml,snk,il}
 
 # Install Json into mono directory
-mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}/mono/newtonsoft-json/"
-find . -type f -exec install -Dm644 {} "$PKG/usr/lib${LIBDIRSUFFIX}/mono/newtonsoft-json/"{} \;
+# Libraries in the Global Assembly Cache are always in /usr/lib, regardless of the architecture
+# /usr/lib64/mono doesn't even get created when running mono.SlackBuild
+mkdir -p "$PKG/usr/lib/mono/newtonsoft-json/"
+find . -type f -exec install -Dm644 {} "$PKG/usr/lib/mono/newtonsoft-json/"{} \;
 
 # Install pkg-config file
 install -Dm644 "$CWD/newtonsoft.json.pc.in" "$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/newtonsoft.json.pc"
@@ -108,7 +110,7 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cat <<EOF > $PKG/install/doinst.sh
-gacutil -i /usr/lib${LIBDIRSUFFIX}/mono/newtonsoft-json/Newtonsoft.Json.dll -root "/usr/lib${LIBDIRSUFFIX}/"
+gacutil -i /usr/lib/mono/newtonsoft-json/Newtonsoft.Json.dll -root "/usr/lib/"
 EOF
 
 cd $PKG
diff --git a/development/newtonsoft-json/newtonsoft-json.info b/development/newtonsoft-json/newtonsoft-json.info
index 8db61e8944..f4d6ce353c 100644
--- a/development/newtonsoft-json/newtonsoft-json.info
+++ b/development/newtonsoft-json/newtonsoft-json.info
@@ -1,8 +1,8 @@
 PRGNAM="newtonsoft-json"
-VERSION="6.0.3"
+VERSION="6.0.4"
 HOMEPAGE="http://james.newtonking.com/json"
-DOWNLOAD="https://github.com/JamesNK/Newtonsoft.Json/archive/6.0.3.tar.gz"
-MD5SUM="85bbee5cf5ab22c686927ecef8c179b5"
+DOWNLOAD="https://github.com/JamesNK/Newtonsoft.Json/archive/6.0.4.tar.gz"
+MD5SUM="7d0c0985f3930e57d802023f5958ed3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mono"
-- 
cgit v1.2.3