On 04/08/10 11:41, [email protected] wrote:
.../src/util/distro-import/137/common/runtime:java
W.r.t. 15489, didn't Phil Race say that the:
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src
as supplied with the SVR4 package are now the correct ones, so would a
simpler fix be to not drop:
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src
and just link those two files to:
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.bfc
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.properties.src
I had thought the SVR4 delivered versions of those files were out of
date relative to what's checked into the IPS gate but I was mistaken.
Thanks for bringing this up.
To avoid confusion, I'm going with the following approach (diff
relative to the gate)
--- 133/common/runtime:java Wed Apr 7 09:24:24 2010
+++ 137/common/runtime:java Thu Apr 8 11:20:10 2010
@@ -5,18 +5,16 @@
drop usr/jdk/instances/jdk1.6.0/jre/LICENSE
drop usr/jdk/instances/jdk1.6.0/jre/README
drop usr/jdk/instances/jdk1.6.0/jre/lib/$(ARCH)/motif21/libmawt.so
-drop usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc
-drop
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src
add file DLJ/LICENSE path=usr/jdk/instances/jdk1.6.0/jre/LICENSE
mode=0644 \
owner=root group=bin
add file DLJ/README path=usr/jdk/instances/jdk1.6.0/jre/README
mode=0644 \
owner=root group=bin
-add file fontconfig.OpenSolaris.bfc \
- path=usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc \
- mode=0644 owner=root group=bin
-add file fontconfig.OpenSolaris.properties.src \
-
path=usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src
\
- mode=0644 owner=root group=bin
+chattr usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc \
+ path=usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.5.11.bfc
+chattr \
+
usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src
\
+
path=usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.5.11.properties.src
+
add link path=usr/bin/ControlPanel target=../java/jre/bin/ControlPanel
add link path=usr/bin/java target=../java/bin/java
add link path=usr/bin/javaws target=../java/bin/javaws
Looks good.
Thanks.
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
