packages: java-sun/java-sun.spec - fixed desc: s/java5/java/ (to much copy-...

[pawelz]

Author: pawelz                       Date: Fri Apr 23 22:04:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed desc: s/java5/java/ (to much copy-paste?)
- some adapterization

---- Files affected:
packages/java-sun:
   java-sun.spec (1.266 -> 1.267) 

---- Diffs:

================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.266 packages/java-sun/java-sun.spec:1.267
--- packages/java-sun/java-sun.spec:1.266	Sun Apr 18 17:09:47 2010
+++ packages/java-sun/java-sun.spec	Sat Apr 24 00:03:58 2010
@@ -150,8 +150,6 @@
 Provides:	java(jsse) = %{version}
 Provides:	java1.4
 Provides:	jre = %{version}
-Obsoletes:	java-blackdown-jre
-Obsoletes:	jre
 Obsoletes:	java(jaas)
 Obsoletes:	java(jaf)
 Obsoletes:	java(jaxp)
@@ -162,6 +160,8 @@
 Obsoletes:	java(jmx)
 Obsoletes:	java(jndi)
 Obsoletes:	java(jsse)
+Obsoletes:	java-blackdown-jre
+Obsoletes:	jre
 
 
 %description jre
@@ -202,12 +202,12 @@
 
 %description jre-X11
 This package symlinks Java SUN X11 libraries provided by
-java5-sun-jre-base-X11 to system-wide directories like /usr/bin,
-making Java SUN default JRE-X11.
+java-sun-jre-base-X11 to system-wide directories like /usr/bin, making
+Java SUN default JRE-X11.
 
 %description jre-X11 -l pl.UTF-8
 Ten pakiet tworzy symboliczne dowiązania do narzędzi X11 Java SUN,
-dostarczanych przez pakiet java5-sun-jre-base-X11, w standardowych
+dostarczanych przez pakiet java-sun-jre-base-X11, w standardowych
 systemowych ścieżkach takich jak /usr/bin, sprawiając tym samym, że
 Java SUN staje się domyślnym JRE-X11 w systemie.
 
@@ -537,7 +537,7 @@
 #
 # for example:
 # old javac: RPATH=$ORIGIN/../lib/i386/jli:$ORIGIN/../jre/lib/i386/jli
-# new javac: RPATH=/usr/lib/jvm/java-sun-1.6.0/jre/lib/i386/jli
+# new javac: RPATH=%{_prefix}/lib/jvm/java-sun-1.6.0/jre/lib/i386/jli
 
 # silly rpath: jre/bin/unpack200: RPATH=$ORIGIN
 chrpath -d $RPM_BUILD_ROOT%{jredir}/bin/unpack200
@@ -1010,6 +1010,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.267  2010/04/23 22:03:58  pawelz
+- fixed desc: s/java5/java/ (to much copy-paste?)
+- some adapterization
+
 Revision 1.266  2010/04/18 15:09:47  jajcus
 - Release: 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.266&r2=1.267&f=u