diff --git a/icedtea-web.spec b/icedtea-web.spec index f0d2c9f..c3790b4 100644 --- a/icedtea-web.spec +++ b/icedtea-web.spec @@ -21,7 +21,7 @@ Name: icedtea-web Version: 2.0.0 -Release: pre.0.3.alpha13.patched1%{?dist}.2 +Release: pre.0.3.alpha13.patched1%{?dist}.3 Summary: Additional Java components for OpenJDK - Java Web Start implementation License: LGPLv2+ and GPLv2 with exceptions @@ -198,9 +198,15 @@ cp pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/%{name}.pom %find_lang %{name} --all-name --with-man %check -appstream-util validate $RPM_BUILD_ROOT/%{_datadir}/appdata/*.xml || : +# takes long, and fails anyway +# appstream-util validate $RPM_BUILD_ROOT/%{_datadir}/appdata/*.xml || : %post +# we had changed master of alternative, thus rmoving the old ones +# this is braking alternatives, thus variabled-out if necessary +if [ ! "x$ITW_20_18" == "xtrue" ] ; then + alternatives --remove javaws.%{_arch} %{_prefix}/bin/javaws.itweb +fi alternatives \ --install %{_bindir}/javaws javaws.%{_arch} %{_libexecdir}/%{name}/javaws %{priority} --family %{preffered_jre}.%{_arch} \ --slave %{_bindir}/itweb-settings itweb-settings %{_libexecdir}/%{name}/itweb-settings \ @@ -244,6 +250,9 @@ exit 0 %changelog +* Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.3 +- added removal of old alternatives. Sorry + * Fri Jul 10 2020 Jiri Vanek - 2.0.0-pre.0.3.alpha13.patched1.2 - fixed removal of alternatives, was not working for years - fixed unexpanded macro in alternatives, reason of non working update from 1.8