[java-1.7.0-openjdk/f20] - fixed incorrect _jvmdir/jre-javaver_origin to _jvmdir/jre-javaver-origin link

[jiri vanek]

commit 86eb08d77127f1780ddfc5982eef915bc9dfba08
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Oct 2 14:19:55 2013 +0200

    - fixed incorrect  _jvmdir/jre-javaver_origin to  _jvmdir/jre-javaver-origin link

 java-1.7.0-openjdk.spec |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 8e801db..c7dc179 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -146,7 +146,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.60
-Release: %{icedtea_version}.6%{?dist}
+Release: %{icedtea_version}.7%{?dist}
 # 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
@@ -1016,7 +1016,18 @@ for X in %{origin} %{javaver} ; do
 %endif
 done
 
-update-alternatives --install %{_jvmdir}/jre-%{javaver}_%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
+
+#we need to remove old alternatives with "_" typo //should live to f21:(
+  ID="%{_jvmdir}/\(\(jre\)\|\(java\)\)-%{javaver}-%{origin}"
+  COMMAND=jre_%{javaver}_%{origin}
+  for alt in $(alternatives --display $COMMAND | grep priority | awk '{print $1}'); do
+    echo $alt | grep -q "$ID"
+    if [ $? -eq 0 ]; then
+      alternatives --remove $COMMAND $alt >& /dev/null || :
+     fi
+  done
+# the old should be removed, so we can install new :(
+update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
 --slave %{_jvmjardir}/jre-%{javaver}       jre_%{javaver}_%{origin}_exports      %{jvmjardir}
 
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -1374,6 +1385,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Wed Oct 02 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.2.7.f20
+- fixed incorrect  _jvmdir/jre-javaver_origin to  _jvmdir/jre-javaver-origin link
+
 * Tue Oct 01 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.2.6.f20
 - added java-abrt connector