Author: jajcus Date: Mon Jun 7 11:28:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- include /usr/%{_lib}/java in the default library path (for JNI files)
- Release: 6
---- Files affected:
packages/icedtea6:
icedtea6.spec (1.62 -> 1.63) , icedtea6-libpath.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.62
packages/icedtea6/icedtea6.spec:1.63
--- packages/icedtea6/icedtea6.spec:1.62 Fri May 7 13:15:48 2010
+++ packages/icedtea6/icedtea6.spec Mon Jun 7 13:28:15 2010
@@ -19,7 +19,7 @@
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
@@ -37,6 +37,7 @@
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}
@@ -401,6 +402,8 @@
# 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} .
@@ -864,6 +867,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2010/06/07 11:28:15 jajcus
+- include /usr/%{_lib}/java in the default library path (for JNI files)
+- Release: 6
+
Revision 1.62 2010/05/07 11:15:48 pawelz
- last commit was rel 5
================================================================
Index: packages/icedtea6/icedtea6-libpath.patch
diff -u /dev/null packages/icedtea6/icedtea6-libpath.patch:1.1
--- /dev/null Mon Jun 7 13:28:20 2010
+++ packages/icedtea6/icedtea6-libpath.patch Mon Jun 7 13:28:15 2010
@@ -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"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
