[packages/icedtea7: 71/103] - include /usr/%{_lib}/java in the default library path (for JNI files) - Release: 6

[jajcus]

commit 7b91ed15008d45ae3f5e6d43ac9623f34743bdb7
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Mon Jun 7 11:28:15 2010 +0000

    - include /usr/%{_lib}/java in the default library path (for JNI files)
    - Release: 6
    
    Changed files:
        icedtea6-libpath.patch -> 1.1
        icedtea6.spec -> 1.63

 icedtea6-libpath.patch | 14 ++++++++++++++
 icedtea6.spec          |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index a9de9d5..2983ed2 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -18,7 +18,7 @@ Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea6
 Version:	1.8
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
@@ -36,6 +36,7 @@ Patch0:		%{name}-i486.patch
 Patch1:		%{name}-ecj_single_thread.patch
 Patch2:		%{name}-no_dtdtype_patch.patch
 Patch3:		%{name}-rpath.patch
+Patch4:		%{name}-libpath.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 %{!?with_bootstrap:BuildRequires:	ant-nodeps}
@@ -400,6 +401,8 @@ Wtyczka z obsługą Javy dla przeglądarek WWW.
 # rpath so IcedTeaPlugin.so can find libxul.so and libxpcom.so
 %patch3 -p1
 
+%patch4 -p1
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
diff --git a/icedtea6-libpath.patch b/icedtea6-libpath.patch
new file mode 100644
index 0000000..66bab4e
--- /dev/null
+++ b/icedtea6-libpath.patch
@@ -0,0 +1,14 @@
+--- icedtea6-1.8/patches/hotspot/original/icedtea-6778662-lib64.patch.orig	2010-06-07 11:05:44.906948049 +0200
++++ icedtea6-1.8/patches/hotspot/original/icedtea-6778662-lib64.patch	2010-06-07 11:06:24.229865044 +0200
+@@ -7,9 +7,9 @@
+ -#define DEFAULT_LIBPATH	"/lib:/usr/lib"
+ +
+ +#if defined(AMD64) || defined(_LP64) && (defined(PPC) || defined(S390))
+-+#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
+++#define DEFAULT_LIBPATH "/usr/lib64/java:/usr/lib64:/lib64:/lib:/usr/lib"
+ +#else
+-+#define DEFAULT_LIBPATH	"/lib:/usr/lib"
+++#define DEFAULT_LIBPATH	"/usr/lib/java:/lib:/usr/lib"
+ +#endif
+  
+  #define EXTENSIONS_DIR	"/lib/ext"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf