packages: java5-sun/java5-sun.spec - P: jdk(%{name}) (/usr/lib/jvm/%{name})...

[jajcus]

Author: jajcus                       Date: Sun Apr 18 08:20:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- P: jdk(%{name}) (/usr/lib/jvm/%{name}) and jre(%{name}) (/usr/lib/jvm/%{name}-jre)

---- Files affected:
packages/java5-sun:
   java5-sun.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/java5-sun/java5-sun.spec
diff -u packages/java5-sun/java5-sun.spec:1.14 packages/java5-sun/java5-sun.spec:1.15
--- packages/java5-sun/java5-sun.spec:1.14	Sat Apr 17 16:18:52 2010
+++ packages/java5-sun/java5-sun.spec	Sun Apr 18 10:20:18 2010
@@ -85,6 +85,7 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-tools = %{version}-%{release}
 Requires:	jpackage-utils >= 0:1.6.6-14
+Provides:	jdk(%{name})
 
 %description jdk-base
 Java Development Kit for Linux.
@@ -165,6 +166,7 @@
 Summary(pl.UTF-8):	Sun JRE - środowisko uruchomieniowe Javy dla Linuksa
 Group:		Development/Languages/Java
 Requires:	jpackage-utils >= 0:1.6.6-14
+Provides:	jre(%{name})
 
 %description jre-base
 Java Runtime Environment for Linux. Does not contain any X11-related
@@ -426,7 +428,9 @@
 cp -a src.zip $RPM_BUILD_ROOT%{_prefix}/src/%{name}-sources
 
 ln -s %{javareldir} $RPM_BUILD_ROOT%{_jvmdir}/java
+ln -s %{javareldir} $RPM_BUILD_ROOT%{_jvmdir}/java-sun
 ln -s %{jrereldir} $RPM_BUILD_ROOT%{_jvmdir}/jre
+ln -s %{jrereldir} $RPM_BUILD_ROOT%{_jvmdir}/java-sun-jre
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/java
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/jre
 
@@ -517,6 +521,7 @@
 
 %files jdk-base
 %defattr(644,root,root,755)
+%{_jvmdir}/%{name}
 %ifarch %{ix86}
 %attr(755,root,root) %{javadir}/bin/HtmlConverter
 %attr(755,root,root) %{javadir}/bin/ControlPanel
@@ -575,6 +580,7 @@
 
 %files jre-base
 %defattr(644,root,root,755)
+%{_jvmdir}/%{name}-jre
 %attr(755,root,root) %{jredir}/bin/pack200
 %attr(755,root,root) %{jredir}/bin/unpack200
 %attr(755,root,root) %{javadir}/bin/pack200
@@ -885,6 +891,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/04/18 08:20:18  jajcus
+- P: jdk(%{name}) (/usr/lib/jvm/%{name}) and jre(%{name}) (/usr/lib/jvm/%{name}-jre)
+
 Revision 1.14  2010/04/17 14:18:52  jajcus
 - do not provide meaningless acronyms – use java(...) instad
 - provide only the actually used
================================================================

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