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

[jajcus]

Author: jajcus                       Date: Sun Apr 18 08:18:41 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/java-sun:
   java-sun.spec (1.264 -> 1.265) 

---- Diffs:

================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.264 packages/java-sun/java-sun.spec:1.265
--- packages/java-sun/java-sun.spec:1.264	Sat Apr 17 16:16:06 2010
+++ packages/java-sun/java-sun.spec	Sun Apr 18 10:18:36 2010
@@ -99,6 +99,7 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
 Requires:	jpackage-utils >= 0:1.6.6-14
+Provides:	jdk(%{name})
 
 %description jdk-base
 Java Development Kit for Linux.
@@ -180,6 +181,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
@@ -522,7 +524,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
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/jsse
@@ -683,6 +687,7 @@
 
 %files jdk-base
 %defattr(644,root,root,755)
+%{_jvmdir}/%{name}
 %attr(755,root,root) %{javadir}/bin/HtmlConverter
 %ifarch %{ix86}
 %attr(755,root,root) %{javadir}/bin/java-rmi.cgi
@@ -769,6 +774,7 @@
 
 %files jre-base
 %defattr(644,root,root,755)
+%{_jvmdir}/%{name}-jre
 %dir %{javadir}
 %dir %{javadir}/bin
 %attr(755,root,root) %{javadir}/bin/pack200
@@ -1004,6 +1010,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.265  2010/04/18 08:18:36  jajcus
+- P: jdk(%{name}) (/usr/lib/jvm/%{name}) and jre(%{name}) (/usr/lib/jvm/%{name}-jre)
+
 Revision 1.264  2010/04/17 14:16:06  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/java-sun/java-sun.spec?r1=1.264&r2=1.265&f=u