From a0239cd14ce68ad257c939a67480d3286c65ac24 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 14 Oct 2011 08:12:28 +0200
Subject: [PATCH] jre: even more fixes.

---
 srcpkgs/jre/INSTALL  |  1 +
 srcpkgs/jre/REMOVE   |  5 +++++
 srcpkgs/jre/template | 38 ++++++++++++++++++++++----------------
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/jre/REMOVE

diff --git a/srcpkgs/jre/INSTALL b/srcpkgs/jre/INSTALL
index e924268d5b..b593120ead 100644
--- a/srcpkgs/jre/INSTALL
+++ b/srcpkgs/jre/INSTALL
@@ -6,6 +6,7 @@ case "${ACTION}" in
 pre)
     ;;
 post)
+    ldconfig -r .
     cat << _EOF
 =====================================================================
 
diff --git a/srcpkgs/jre/REMOVE b/srcpkgs/jre/REMOVE
new file mode 100644
index 0000000000..cd817ae8a6
--- /dev/null
+++ b/srcpkgs/jre/REMOVE
@@ -0,0 +1,5 @@
+case $ACTION in
+post)
+	ldconfig -r .
+	;;
+esac
diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template
index 4c51ef2168..f9141c370d 100644
--- a/srcpkgs/jre/template
+++ b/srcpkgs/jre/template
@@ -2,7 +2,7 @@
 pkgname=jre
 _extraversion=1.7.0
 version=7
-revision=1
+revision=2
 distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}/jre-${version}-linux-x64.tar.gz"
 build_style=custom-install
 short_desc="Oracle's Java Runtime Environment (JRE) - Version 7"
@@ -48,36 +48,42 @@ do_install()
 {
 	# Install desktop related items
 	vmkdir		usr/share
-	vcopy		${wrksrc}/lib/desktop/icons usr/share
-	vcopy		${wrksrc}/lib/desktop/applications usr/share
-	vcopy		${wrksrc}/lib/desktop/mime usr/share
+	vcopy		lib/desktop/icons usr/share
+	vcopy		lib/desktop/applications usr/share
+	vcopy		lib/desktop/mime usr/share
+	vcopy		lib/locale usr/share
+	vcopy		man usr/share
 
 	# Install mozilla-compatible browser plugin
 	vmkdir		usr/lib/mozilla/plugins
-	vinstall	${wrksrc}/lib/amd64/libnpjp2.so 755 usr/lib/mozilla/plugins	          
+	vinstall	lib/amd64/libnpjp2.so 755 usr/lib/mozilla/plugins	          
 
 	# Install license(s)
 	vmkdir		usr/share/licenses/jre
-	vcopy		${wrksrc}/COPYRIGHT usr/share/licenses/jre
-	vcopy		${wrksrc}/LICENSE usr/share/licenses/jre
-	vcopy		${wrksrc}/THIRDPARTYLICENSEREADME.txt usr/share/licenses/jre
+	vcopy		COPYRIGHT usr/share/licenses/jre
+	vcopy		LICENSE usr/share/licenses/jre
+	vcopy		THIRDPARTYLICENSEREADME.txt usr/share/licenses/jre
 
 	# Fix system prefs folder FS#18872
 	vmkdir		etc/.java/.systemPrefs
     
 	# For system environment vars and desktop extra shortcut
-	vinstall	${FILESDIR}/jre.sh 644 etc/profile.d
-	vinstall 	${FILESDIR}/java-policy-settings.desktop 644 usr/share/applications
+	vinstall	jre.sh 644 etc/profile.d
+	vinstall 	java-policy-settings.desktop 644 usr/share/applications
 
 	# Install JRE
 	vmkdir		opt/java/jre
-	vcopy		${wrksrc}/bin opt/java/jre
-	vcopy		${wrksrc}/lib opt/java/jre
-	vcopy		${wrksrc}/man opt/java/jre
-	vcopy		${wrksrc}/plugin opt/java/jre
-	vcopy		${wrksrc}/release opt/java/jre
-	vcopy		${wrksrc}/Welcome.html opt/java/jre
+	vcopy		bin opt/java/jre
+	vcopy		lib opt/java/jre
+	vcopy		plugin opt/java/jre
+	vcopy		release opt/java/jre
+	vcopy		Welcome.html opt/java/jre
 
 	rm -rf ${DESTDIR}/opt/java/jre/lib/desktop
+	rm -rf ${DESTDIR}/opt/java/jre/lib/locale
 
+	# linker's config
+        vmkdir etc/ld.so.conf.d
+        echo "/opt/java/jre/lib/amd64" > \
+                ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
 }