From 144a7e1e6997f390389d111a5672cf58b825fde4 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Fri, 25 Mar 2011 01:37:06 +0100
Subject: [PATCH] nspr: fixed to correctly install the libraries and not some
 bogus symlinks into mozillas weired build environment

---
 develop/nspr/nspr.conf | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/develop/nspr/nspr.conf b/develop/nspr/nspr.conf
index 5b09ba6eb..889df8da7 100644
--- a/develop/nspr/nspr.conf
+++ b/develop/nspr/nspr.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../nspr/nspr.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2011 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -26,14 +26,19 @@ nspr_install() {
 	echo "cleaning before the real installation ..."
 	rm -rvf dist/include/nspr/md dist/bin/*.so
 
-	for x in dist/lib/*.so; do
-		mv -v "$x" "$x.$minor"
+	# create a 'dist/lib-final' where we copy the whole symlinked
+	# stuff from 'dist/lib' using --dereference to get the real file
+	mkdir -p dist/lib-final
+	cp -av --dereference  dist/lib/* dist/lib-final/
+
+	for x in dist/lib-final/*.so; do
+		mv -fv "$x" "$x.$minor"
 		chmod +x "$x.$minor"
 		ln -svnf "${x##*/}.$minor" "$x"
 	done
 
 	echo "installing ..."
-	cp -avf dist/lib/* $root$libdir/
+	cp -avf dist/lib-final/* $root$libdir/
 	rm -rf $root$includedir/nspr/
 	cp -av dist/include/nspr $root$includedir/
 }