packages: java-sun/java-sun.spec - package missing files - unset CLASSPATH ...
qboosh
qboosh at pld-linux.org
Thu Apr 8 08:51:47 CEST 2010
Author: qboosh Date: Thu Apr 8 06:51:47 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- package missing files
- unset CLASSPATH before running Test
---- Files affected:
packages/java-sun:
java-sun.spec (1.243 -> 1.244)
---- Diffs:
================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.243 packages/java-sun/java-sun.spec:1.244
--- packages/java-sun/java-sun.spec:1.243 Thu Apr 8 07:55:33 2010
+++ packages/java-sun/java-sun.spec Thu Apr 8 08:51:42 2010
@@ -2,11 +2,6 @@
# TODO:
# - better way to choose preferred jvm (currently the symlinks are hardcoded)
# Maybe a package containing only the symlinks?
-# - warning: Installed (but unpackaged) file(s) found:
-# /usr/lib/jvm/java-sun-1.6.0.10/demo/jvmti/index.html
-# /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/fontconfig.RedHat.4.bfc
-# /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/fontconfig.RedHat.4.properties.src
-# /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/servicetag/jdk_header.png
# - dep loop (can be solved by moving shared libs to java-sun-libs):
# java-sun-jre>java-sun-tools
# - 1.6.0.12 problem with RSA II:
@@ -354,6 +349,8 @@
echo >&2 "WARNING: /proc not mounted -- compile test may fail"
fi
+# CLASSPATH prevents finding Test.class in .
+unset CLASSPATH || :
# $ORIGIN does not work on PLD builders. workaround with LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli
./bin/java Test
@@ -764,6 +761,8 @@
%{jredir}/lib/fontconfig.RedHat.2.1.properties.src
%{jredir}/lib/fontconfig.RedHat.3.bfc
%{jredir}/lib/fontconfig.RedHat.3.properties.src
+%{jredir}/lib/fontconfig.RedHat.4.bfc
+%{jredir}/lib/fontconfig.RedHat.4.properties.src
%{jredir}/lib/fontconfig.RedHat.bfc
%{jredir}/lib/fontconfig.RedHat.properties.src
%{jredir}/lib/fontconfig.SuSE.bfc
@@ -774,6 +773,7 @@
%{jredir}/lib/fontconfig.Turbo.properties.src
%{jredir}/lib/fontconfig.bfc
%{jredir}/lib/fontconfig.properties.src
+%{jredir}/lib/servicetag
%attr(755,root,root) %{jredir}/lib/%{arch}/headless/libmawt.so
%attr(755,root,root) %{jredir}/lib/%{arch}/libsaproc.so
%attr(755,root,root) %{jredir}/lib/%{arch}/libunpack.so
@@ -882,6 +882,7 @@
%{javadir}/demo/jvmti/*/src
%{javadir}/demo/jvmti/*/README*
%{javadir}/demo/jvmti/*/*.jar
+%{javadir}/demo/jvmti/index.html
%{javadir}/demo/management
%{javadir}/demo/nbproject
%{javadir}/demo/plugin
@@ -938,6 +939,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.244 2010/04/08 06:51:42 qboosh
+- package missing files
+- unset CLASSPATH before running Test
+
Revision 1.243 2010/04/08 05:55:33 qboosh
- (blacklist) %verify() without %config is evil, dropped
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.243&r2=1.244&f=u
More information about the pld-cvs-commit
mailing list