packages: jpackage-utils/jpackage-utils.spec, jpackage-utils/jpackage-utils...

[jajcus]

Author: jajcus                       Date: Wed Apr 21 11:36:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build-classpath when $JAVA_HOME is set to a symlink
- Release: 3

---- Files affected:
packages/jpackage-utils:
   jpackage-utils.spec (1.43 -> 1.44) , jpackage-utils-jvm_exports_via_link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/jpackage-utils/jpackage-utils.spec
diff -u packages/jpackage-utils/jpackage-utils.spec:1.43 packages/jpackage-utils/jpackage-utils.spec:1.44
--- packages/jpackage-utils/jpackage-utils.spec:1.43	Thu Apr 15 00:49:01 2010
+++ packages/jpackage-utils/jpackage-utils.spec	Wed Apr 21 13:36:44 2010
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.7.5
-Release:	2
+Release:	3
 Epoch:		0
 License:	BSD-like
 Group:		Development/Languages/Java
@@ -15,6 +15,7 @@
 Patch2:		%{name}-errors.patch
 Patch3:		%{name}-noyelling.patch
 Patch4:		%{name}-readlink.patch
+Patch5:		%{name}-jvm_exports_via_link.patch
 URL:		http://www.jpackage.org/
 BuildRequires:	rpmbuild(macros) >= 1.555
 Requires:	/bin/egrep
@@ -84,6 +85,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # we cp -a complete dir from source
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -215,6 +217,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2010/04/21 11:36:44  jajcus
+- fix build-classpath when $JAVA_HOME is set to a symlink
+- Release: 3
+
 Revision 1.43  2010/04/14 22:49:01  pawelz
 - updated BR: rpmbuild(macros). Now it is >= 1.555.
 

================================================================
Index: packages/jpackage-utils/jpackage-utils-jvm_exports_via_link.patch
diff -u /dev/null packages/jpackage-utils/jpackage-utils-jvm_exports_via_link.patch:1.1
--- /dev/null	Wed Apr 21 13:36:50 2010
+++ packages/jpackage-utils/jpackage-utils-jvm_exports_via_link.patch	Wed Apr 21 13:36:44 2010
@@ -0,0 +1,11 @@
+--- jpackage-utils-1.7.5/java-utils/java-functions.orig	2010-04-21 13:30:51.000000000 +0200
++++ jpackage-utils-1.7.5/java-utils/java-functions	2010-04-21 13:31:54.000000000 +0200
+@@ -130,7 +130,7 @@
+ # Requires a correct $JAVA_LIBDIR, $JAVA_HOME and $JAVA_CMD
+ set_jvm_dirs() {
+     # Jar repository provided by the JVM
+-    JVM_LIBDIR=$JVM_ROOT-exports/$(echo "$JAVA_HOME" |\
++    JVM_LIBDIR=$JVM_ROOT-exports/$(readlink -f "$JAVA_HOME" |\
+         sed -n "s+$JVM_ROOT/\([-_[:alnum:].]*\)\(.*\)+\1+p")
+ 
+     # Java standard version of the JVM.  -fullversion seems to be lot faster
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jpackage-utils/jpackage-utils.spec?r1=1.43&r2=1.44&f=u