[java-1.7.0-openjdk/f19] setting of alternatives moved into conditional block controlled by graceful_links, added graceful_li

[jiri vanek]

commit 014a624bfa34e45df6fee56bffb5dbbae14e9a38
Author: Jiri Vanek work <jvanek at judovana.home>
Date:   Sat Jul 27 15:32:50 2013 +0200

    setting of alternatives moved into conditional block controlled by graceful_links, added graceful_links, set to disabled (0),fix broken jre_exports alternatives links (bug #979128, orion)

 java-1.7.0-openjdk.spec |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index e93d0ca..2de951d 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -8,6 +8,8 @@
 %global multilib_arches %{power64} sparc64 x86_64 %{aarch64}
 %global jit_arches		%{ix86} x86_64 sparcv9 sparc64
 
+#links are set forcibly, f19 32b fix
+%global graceful_links 0
 
 %ifarch x86_64
 %global archbuild amd64
@@ -139,7 +141,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.1%{?dist}
+Release: %{icedtea_version}.3%{?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
@@ -860,7 +862,7 @@ ext=.gz
 alternatives \
   --install %{_bindir}/java java %{jrebindir}/java %{priority} \
   --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir} \
-  --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jredir} \
+  --slave %{_jvmjardir}/jre jre_exports %{jvmjardir} \
   --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
   --slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
   --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
@@ -888,10 +890,14 @@ alternatives \
   --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \
   %{_mandir}/man1/unpack200-%{uniquesuffix}.1$ext
 
+%if %{graceful_links}
 # Gracefully update to this one if needed
 if [ $MAKE_THIS_DEFAULT -eq 1 ]; then
+%endif
   alternatives --set $COMMAND %{jrebindir}/java
+%if %{graceful_links}
 fi
+%endif
 
 for X in %{origin} %{javaver} ; do
   # Note current status of alternatives
@@ -919,16 +925,19 @@ for X in %{origin} %{javaver} ; do
     --install %{_jvmdir}/jre-"$X" \
     jre_"$X" %{_jvmdir}/%{jredir} %{priority} \
     --slave %{_jvmjardir}/jre-"$X" \
-    jre_"$X"_exports %{_jvmjardir}/%{jredir}
-
+    jre_"$X"_exports %{jvmjardir}
+%if %{graceful_links}
   # Gracefully update to this one if needed
   if [ $MAKE_THIS_DEFAULT -eq 1 ]; then
+%endif
     alternatives --set $COMMAND %{_jvmdir}/%{jredir}
+%if %{graceful_links}
   fi
+%endif
 done
 
 update-alternatives --install %{_jvmdir}/jre-%{javaver}_%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
---slave %{_jvmjardir}/jre-%{javaver}       jre_%{javaver}_%{origin}_exports      %{_jvmjardir}/%{uniquesuffix}
+--slave %{_jvmjardir}/jre-%{javaver}       jre_%{javaver}_%{origin}_exports      %{jvmjardir}
 
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
@@ -1068,9 +1077,13 @@ alternatives \
   %{_mandir}/man1/xjc-%{uniquesuffix}.1$ext
 
 # Gracefully update to this one if needed
+%if %{graceful_links}
 if [ $MAKE_THIS_DEFAULT -eq 1 ]; then
+%endif
   alternatives --set $COMMAND %{sdkbindir}/javac
+%if %{graceful_links}
 fi
+%endif
 
 for X in %{origin} %{javaver} ; do
   # Note current status of alternatives
@@ -1100,10 +1113,14 @@ for X in %{origin} %{javaver} ; do
     --slave %{_jvmjardir}/java-"$X" \
     java_sdk_"$X"_exports %{_jvmjardir}/%{sdkdir}
 
+%if %{graceful_links}
   # Gracefully update to this one if needed
   if [ $MAKE_THIS_DEFAULT -eq 1 ]; then
+%endif
     alternatives --set $COMMAND %{_jvmdir}/%{sdkdir}
+%if %{graceful_links}
   fi
+%endif
 done
 
 update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir} %{priority} \
@@ -1145,10 +1162,14 @@ alternatives \
   --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir}/api \
   %{priority}
 
+%if %{graceful_links}
 # Gracefully update to this one if needed
 if [ $MAKE_THIS_DEFAULT -eq 1 ]; then
+%endif
   alternatives --set $COMMAND %{_javadocdir}/%{uniquejavadocdir}/api
+%if %{graceful_links}
 fi
+%endif
 
 exit 0
 
@@ -1270,6 +1291,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Sat Jul 27 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.12.3.f20
+- setting of alternatives moved into conditional block controlled by graceful_links
+- added graceful_links, set to disabled (0)
+
+* Fri Jul 26 2013 Orion Poplawski <orion at cora.nwra.com> - 1.7.0.25-2.3.12.2.fc19
+- Fix broken jre_exports alternatives links (bug #979128)
+
 * Fri Jul 26 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.12.1.f19
 - refreshed icedtea7-forest 2.3.12