From b20f57df1b3e8c2d76e4b7d42408cb13fbe1e90f Mon Sep 17 00:00:00 2001 From: happy_orange Date: Tue, 14 Jun 2022 22:23:59 -0400 Subject: [PATCH] fix some error in postun of headless fastdebug and slow fastdebug --- java-1.8.0-alibaba-dragonwell.spec | 111 +++++++++++++++-------------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/java-1.8.0-alibaba-dragonwell.spec b/java-1.8.0-alibaba-dragonwell.spec index e8b7a68..53f59c4 100644 --- a/java-1.8.0-alibaba-dragonwell.spec +++ b/java-1.8.0-alibaba-dragonwell.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without fastdebug %bcond_without slowdebug @@ -106,7 +106,7 @@ rm -f %{_localstatedir}/lib/rpm-state/"$MASTER"_$FAMILY > /dev/null if nonLocalisedAlternativesDisplayOfMaster > /dev/null ; then if headOfAbove 1 | grep -q manual ; then - if headOfAbove 2 | tail -n 1 | grep -q %{compatiblename} ; then + if headOfAbove 2 | tail -n 1 | grep -q %{name} ; then headOfAbove 2 > %{_localstatedir}/lib/rpm-state/"$MASTER"_"$FAMILY" fi fi @@ -1075,8 +1075,8 @@ fi %postun headless post_state=$1 %{save_and_remove_alternatives java %{jrebindir}/java $post_state %{family}} -%{save_and_remove_alternatives jre_%{origin} %{_jvmdir}/%{sdkdir} $post_state %{family}} -%{save_and_remove_alternatives jre_%{javaver} %{_jvmdir}/%{sdkdir} $post_state %{family}} +%{save_and_remove_alternatives jre_%{origin} %{_jvmdir}/%{jredir} $post_state %{family}} +%{save_and_remove_alternatives jre_%{javaver} %{_jvmdir}/%{jredir} $post_state %{family}} %{save_and_remove_alternatives jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} $post_state %{family}} %posttrans @@ -1305,43 +1305,43 @@ let PRIORITY=PRIORITY-1 ext=.gz key=java alternatives \ - --install %{_bindir}/java $key %{jrebindir -- {slowdebug_build}}/java $PRIORITY --family %{family} \ - --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- {slowdebug_build}} \ - --slave %{_bindir}/alt-java alt-java %{jrebindir -- {slowdebug_build}}/alt-java \ - --slave %{_bindir}/jjs jjs %{jrebindir -- {slowdebug_build}}/jjs \ - --slave %{_bindir}/keytool keytool %{jrebindir -- {slowdebug_build}}/keytool \ - --slave %{_bindir}/orbd orbd %{jrebindir -- {slowdebug_build}}/orbd \ - --slave %{_bindir}/pack200 pack200 %{jrebindir -- {slowdebug_build}}/pack200 \ - --slave %{_bindir}/rmid rmid %{jrebindir -- {slowdebug_build}}/rmid \ - --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- {slowdebug_build}}/rmiregistry \ - --slave %{_bindir}/servertool servertool %{jrebindir -- {slowdebug_build}}/servertool \ - --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- {slowdebug_build}}/tnameserv \ - --slave %{_bindir}/policytool policytool %{jrebindir -- {slowdebug_build}}/policytool \ - --slave %{_bindir}/unpack200 unpack200 %{jrebindir -- {slowdebug_build}}/unpack200 \ + --install %{_bindir}/java $key %{jrebindir -- %{slowdebug_build}}/java $PRIORITY --family %{family} \ + --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- %{slowdebug_build}} \ + --slave %{_bindir}/alt-java alt-java %{jrebindir -- %{slowdebug_build}}/alt-java \ + --slave %{_bindir}/jjs jjs %{jrebindir -- %{slowdebug_build}}/jjs \ + --slave %{_bindir}/keytool keytool %{jrebindir -- %{slowdebug_build}}/keytool \ + --slave %{_bindir}/orbd orbd %{jrebindir -- %{slowdebug_build}}/orbd \ + --slave %{_bindir}/pack200 pack200 %{jrebindir -- %{slowdebug_build}}/pack200 \ + --slave %{_bindir}/rmid rmid %{jrebindir -- %{slowdebug_build}}/rmid \ + --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{slowdebug_build}}/rmiregistry \ + --slave %{_bindir}/servertool servertool %{jrebindir -- %{slowdebug_build}}/servertool \ + --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- %{slowdebug_build}}/tnameserv \ + --slave %{_bindir}/policytool policytool %{jrebindir -- %{slowdebug_build}}/policytool \ + --slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{slowdebug_build}}/unpack200 \ --slave %{_mandir}/man1/java.1$ext java.1$ext \ - %{_mandir}/man1/java-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/java-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/alt-java.1$ext alt-java.1$ext \ - %{_mandir}/man1/alt-java-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/alt-java-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \ - %{_mandir}/man1/jjs-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/jjs-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \ - %{_mandir}/man1/keytool-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/keytool-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \ - %{_mandir}/man1/orbd-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/orbd-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \ - %{_mandir}/man1/pack200-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/pack200-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \ - %{_mandir}/man1/rmid-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/rmid-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \ - %{_mandir}/man1/rmiregistry-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \ - %{_mandir}/man1/servertool-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/servertool-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \ - %{_mandir}/man1/tnameserv-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/tnameserv-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \ - %{_mandir}/man1/policytool-%{uniquesuffix -- {slowdebug_build}}.1$ext \ + %{_mandir}/man1/policytool-%{uniquesuffix -- %{slowdebug_build}}.1$ext \ --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \ - %{_mandir}/man1/unpack200-%{uniquesuffix -- {slowdebug_build}}.1$ext + %{_mandir}/man1/unpack200-%{uniquesuffix -- %{slowdebug_build}}.1$ext %{set_if_needed_alternatives $key %{family}} @@ -1553,43 +1553,43 @@ let PRIORITY=PRIORITY-1 ext=.gz key=java alternatives \ - --install %{_bindir}/java $key %{jrebindir -- {fastdebug_build}}/java $PRIORITY --family %{family} \ - --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- {fastdebug_build}} \ - --slave %{_bindir}/alt-java alt-java %{jrebindir -- {fastdebug_build}}/alt-java \ - --slave %{_bindir}/jjs jjs %{jrebindir -- {fastdebug_build}}/jjs \ - --slave %{_bindir}/keytool keytool %{jrebindir -- {fastdebug_build}}/keytool \ - --slave %{_bindir}/orbd orbd %{jrebindir -- {fastdebug_build}}/orbd \ - --slave %{_bindir}/pack200 pack200 %{jrebindir -- {fastdebug_build}}/pack200 \ - --slave %{_bindir}/rmid rmid %{jrebindir -- {fastdebug_build}}/rmid \ - --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- {fastdebug_build}}/rmiregistry \ - --slave %{_bindir}/servertool servertool %{jrebindir -- {fastdebug_build}}/servertool \ - --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- {fastdebug_build}}/tnameserv \ - --slave %{_bindir}/policytool policytool %{jrebindir -- {fastdebug_build}}/policytool \ - --slave %{_bindir}/unpack200 unpack200 %{jrebindir -- {fastdebug_build}}/unpack200 \ + --install %{_bindir}/java $key %{jrebindir -- %{fastdebug_build}}/java $PRIORITY --family %{family} \ + --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- %{fastdebug_build}} \ + --slave %{_bindir}/alt-java alt-java %{jrebindir -- %{fastdebug_build}}/alt-java \ + --slave %{_bindir}/jjs jjs %{jrebindir -- %{fastdebug_build}}/jjs \ + --slave %{_bindir}/keytool keytool %{jrebindir -- %{fastdebug_build}}/keytool \ + --slave %{_bindir}/orbd orbd %{jrebindir -- %{fastdebug_build}}/orbd \ + --slave %{_bindir}/pack200 pack200 %{jrebindir -- %{fastdebug_build}}/pack200 \ + --slave %{_bindir}/rmid rmid %{jrebindir -- %{fastdebug_build}}/rmid \ + --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{fastdebug_build}}/rmiregistry \ + --slave %{_bindir}/servertool servertool %{jrebindir -- %{fastdebug_build}}/servertool \ + --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- %{fastdebug_build}}/tnameserv \ + --slave %{_bindir}/policytool policytool %{jrebindir -- %{fastdebug_build}}/policytool \ + --slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{fastdebug_build}}/unpack200 \ --slave %{_mandir}/man1/java.1$ext java.1$ext \ - %{_mandir}/man1/java-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/java-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/alt-java.1$ext alt-java.1$ext \ - %{_mandir}/man1/alt-java-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/alt-java-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \ - %{_mandir}/man1/jjs-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/jjs-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \ - %{_mandir}/man1/keytool-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/keytool-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \ - %{_mandir}/man1/orbd-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/orbd-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \ - %{_mandir}/man1/pack200-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/pack200-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \ - %{_mandir}/man1/rmid-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/rmid-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \ - %{_mandir}/man1/rmiregistry-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \ - %{_mandir}/man1/servertool-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/servertool-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \ - %{_mandir}/man1/tnameserv-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/tnameserv-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \ - %{_mandir}/man1/policytool-%{uniquesuffix -- {fastdebug_build}}.1$ext \ + %{_mandir}/man1/policytool-%{uniquesuffix -- %{fastdebug_build}}.1$ext \ --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \ - %{_mandir}/man1/unpack200-%{uniquesuffix -- {fastdebug_build}}.1$ext + %{_mandir}/man1/unpack200-%{uniquesuffix -- %{fastdebug_build}}.1$ext %{set_if_needed_alternatives $key %{family}} @@ -2633,5 +2633,8 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %endif %changelog +* Wed Jun 15 2022 happy_orange - 1:1.8.0-2 +- fix some error in postun of headless fastdebug and slow fastdebug + * Thu May 26 2022 happy_orange - 1:1.8.0-1 - Init package from dragonwell -- Gitee