SPECS (java-sun-1_4): java-sun.spec - there's no javaws.cfg - proc...

glen glen at pld-linux.org
Tue Apr 10 20:33:16 CEST 2007


Author: glen                         Date: Tue Apr 10 18:33:16 2007 GMT
Module: SPECS                         Tag: java-sun-1_4
---- Log message:
- there's no javaws.cfg
- process with macros.java

---- Files affected:
SPECS:
   java-sun.spec (1.54.2.12 -> 1.54.2.13) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.54.2.12 SPECS/java-sun.spec:1.54.2.13
--- SPECS/java-sun.spec:1.54.2.12	Tue Apr 10 14:28:53 2007
+++ SPECS/java-sun.spec	Tue Apr 10 20:33:10 2007
@@ -1,11 +1,12 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 46.0
 Summary:	Sun JDK (Java Development Kit) for Linux
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.4.2_14
-Release:	0.2
+Release:	0.3
 License:	restricted, non-distributable
 Group:		Development/Languages/Java
 # download through forms from http://java.sun.com/j2se/1.4.2/download.html
@@ -296,7 +297,6 @@
 
 install -d $RPM_BUILD_ROOT%{jredir}/javaws
 cp -a jre/javaws/* $RPM_BUILD_ROOT%{jredir}/javaws
-perl -p -i -e 's#javaws\.cfg\.jre\.0\.path=.*#javaws\.cfg\.jre\.0\.path=%{jredir}/bin/java#' $RPM_BUILD_ROOT%{jredir}/javaws/javaws.cfg
 ln -sf %{jredir}/javaws/javaws.jar $RPM_BUILD_ROOT%{_javadir}/javaws.jar
 ln -sf %{jredir}/javaws/javaws-l10n.jar $RPM_BUILD_ROOT%{_javadir}/javaws-l10n.jar
 
@@ -531,6 +531,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54.2.13  2007/04/10 18:33:10  glen
+- there's no javaws.cfg
+- process with macros.java
+
 Revision 1.54.2.12  2007/04/10 12:28:53  glen
 - update to 1.4.2_14
 - add java(ClassDataVersion)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.54.2.12&r2=1.54.2.13&f=u



More information about the pld-cvs-commit mailing list