Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	java-7.spec
@@ -7,8 +7,10 @@ Summary: Java 7 Update meta package Source0: j7update-fix.sh BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: zypper -Requires: zypper +Conflicts: java-1_6_0-sun java-1_6_0-sun-plugin java-1_6_0-sun-alsa +Conflicts: java-1_6_0-ibm +Conflicts: java-1_6_0-openjdk +Requires: java-1_7_0-sun java-1_7_0-sun-plugin java-1_7_0-sun-alsa %description Update helper script for Java 1.6 to Java 1.7 migration. x 1 @@ -7,8 +7,10 @@ 2 Summary: Java 7 Update meta package 3 Source0: j7update-fix.sh 4 BuildRoot: %{_tmppath}/%{name}-%{version}-root 5 -BuildRequires: zypper 6 -Requires: zypper 7 +Conflicts: java-1_6_0-sun java-1_6_0-sun-plugin java-1_6_0-sun-alsa 8 +Conflicts: java-1_6_0-ibm 9 +Conflicts: java-1_6_0-openjdk 10 +Requires: java-1_7_0-sun java-1_7_0-sun-plugin java-1_7_0-sun-alsa 11 12 %description 13 Update helper script for Java 1.6 to Java 1.7 migration. 14
[-] [+]	Changed	j7update-fix.sh ^
@@ -1,6 +1,4 @@ #!/bin/bash -/usr/bin/zypper -q -n remove java-1_6_0-sun java-1_6_0-sun-plugin java-1_6_0-sun-alsa \|\| : -/usr/bin/zypper -q -n in java-1_7_0-sun java-1_7_0-sun-plugin java-1_7_0-sun-alsa \|\| : cd /etc/alternatives /bin/ln -sf /usr/lib64/jvm/jre-1.7.0-sun jre /bin/ln -sf /usr/lib64/jvm/jre-1.7.0-sun/bin/java java @@ -13,4 +11,3 @@ /bin/ln -sf /usr/lib64/jvm/jre-1.7.0-sun/bin/tnameserv tnameserv /bin/ln -sf /usr/lib64/jvm-exports/jre-1.7.0-sun jre_sun /bin/ln -sf /usr/lib64/jvm-exports/jre-1.7.0-sun jre_exports -/usr/bin/zypper -q -n remove java-1_6_0-ibm \|\| :