Merge branch 'rosa2014.1' of https://abf.rosalinux.ru/import/java-1.8.0-openjdk into rosa2014.1

java-1.8.0-openjdk.spec

@@ -130,7 +130,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 2.%{buildver}
+Release: 1.%{buildver}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -168,6 +168,10 @@ Source8: systemtap-tapset.tar.gz
 Source9: jconsole.desktop.in
 Source10: policytool.desktop.in
 
+# Keep this file the same among different openjdk projects (7, 8, etc.)
+# or switch to alternatives
+Source78: openjdk-java.desktop
+
 # nss configuration file
 Source11: nss.cfg
 
@@ -704,6 +708,8 @@ for e in jconsole policytool ; do
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
 done
 
+install -m644 %{SOURCE78} %{buildroot}%{_datadir}/applications/
+
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
@@ -1023,6 +1029,7 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/security/nss.cfg
 %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
 %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
+%{_datadir}/applications/openjdk-java.desktop
 
 %files devel
 %defattr(-,root,root,-)

openjdk-java.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=OpenJDK Java Runtime
+Name[fi]=OpenJDK Java - ajonaikainen ympäristö
+Name[ru]=OpenJDK Java - среда выполнения
+Comment=OpenJDK Java Runtime
+Comment[fi]=OpenJDK Java - ajonaikainen ympäristö
+Comment[ru]=OpenJDK Java - среда выполнения
+Exec=/usr/bin/java -jar %f
+Terminal=false
+Type=Application
+Icon=java
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true