alternatives creation moved to posttrans
- Thus fixing the old reisntall issue: - https://bugzilla.redhat.com/show_bug.cgi?id=1200302 - https://bugzilla.redhat.com/show_bug.cgi?id=1976053
This commit is contained in:
Jiri Vanek
parent
a3c023b715
commit
ac6e9295df
@ -65,7 +65,7 @@
|
||||
# in alternatives those are slaves and master, very often triplicated by man pages
|
||||
# in files all masters and slaves are ghosted
|
||||
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
|
||||
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
|
||||
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ -e alternatives
|
||||
# TODO - fix those hardcoded lists via single list
|
||||
# Those files must *NOT* be ghosted for *slowdebug* packages
|
||||
# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
|
||||
@ -291,7 +291,7 @@
|
||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||
# eg jdk8u60-b27 -> b27
|
||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||
%global rpmrelease 2
|
||||
%global rpmrelease 3
|
||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
@ -397,12 +397,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||
exit 0
|
||||
}
|
||||
|
||||
|
||||
%define post_headless() %{expand:
|
||||
%ifarch %{share_arches}
|
||||
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
|
||||
%endif
|
||||
|
||||
%define alternatives_java_install() %{expand:
|
||||
PRIORITY=%{priority}
|
||||
if [ "%{?1}" == %{debug_suffix} ]; then
|
||||
let PRIORITY=PRIORITY-1
|
||||
@ -452,8 +447,13 @@ for X in %{origin} %{javaver} ; do
|
||||
alternatives --install %{_jvmdir}/jre-"$X" jre_"$X" %{_jvmdir}/%{jredir -- %{?1}} $PRIORITY --family %{name}.%{_arch}
|
||||
done
|
||||
|
||||
update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY --family %{name}.%{_arch}
|
||||
alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk -- %{?1}} $PRIORITY --family %{name}.%{_arch}
|
||||
}
|
||||
|
||||
%define post_headless() %{expand:
|
||||
%ifarch %{share_arches}
|
||||
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
|
||||
%endif
|
||||
|
||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
@ -490,8 +490,8 @@ exit 0
|
||||
%{update_desktop_icons}
|
||||
}
|
||||
|
||||
%define post_devel() %{expand:
|
||||
|
||||
%define alternatives_javac_install() %{expand:
|
||||
PRIORITY=%{priority}
|
||||
if [ "%{?1}" == %{debug_suffix} ]; then
|
||||
let PRIORITY=PRIORITY-1
|
||||
@ -599,7 +599,9 @@ for X in %{origin} %{javaver} ; do
|
||||
done
|
||||
|
||||
update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir -- %{?1}} $PRIORITY --family %{name}.%{_arch}
|
||||
}
|
||||
|
||||
%define post_devel() %{expand:
|
||||
update-desktop-database %{_datadir}/applications &> /dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
@ -622,11 +624,11 @@ exit 0
|
||||
}
|
||||
|
||||
%define posttrans_devel() %{expand:
|
||||
%{alternatives_javac_install -- %{?1}}
|
||||
%{update_desktop_icons}
|
||||
}
|
||||
|
||||
%define post_javadoc() %{expand:
|
||||
|
||||
%define alternatives_javadoc_install() %{expand:
|
||||
PRIORITY=%{priority}
|
||||
if [ "%{?1}" == %{debug_suffix} ]; then
|
||||
let PRIORITY=PRIORITY-1
|
||||
@ -643,8 +645,7 @@ exit 0
|
||||
exit 0
|
||||
}
|
||||
|
||||
%define post_javadoc_zip() %{expand:
|
||||
|
||||
%define alternatives_javadoczip_install() %{expand:
|
||||
PRIORITY=%{priority}
|
||||
if [ "%{?1}" == %{debug_suffix} ]; then
|
||||
let PRIORITY=PRIORITY-1
|
||||
@ -2340,6 +2341,9 @@ cjc.mainProgram(args)
|
||||
%posttrans
|
||||
%{posttrans_script %{nil}}
|
||||
|
||||
%posttrans headless
|
||||
%{alternatives_java_install %{nil}}
|
||||
|
||||
%post devel
|
||||
%{post_devel %{nil}}
|
||||
|
||||
@ -2349,14 +2353,14 @@ cjc.mainProgram(args)
|
||||
%posttrans devel
|
||||
%{posttrans_devel %{nil}}
|
||||
|
||||
%post javadoc
|
||||
%{post_javadoc %{nil}}
|
||||
%posttrans javadoc
|
||||
%{alternatives_javadoc_install %{nil}}
|
||||
|
||||
%postun javadoc
|
||||
%{postun_javadoc %{nil}}
|
||||
|
||||
%post javadoc-zip
|
||||
%{post_javadoc_zip %{nil}}
|
||||
%posttrans javadoc-zip
|
||||
%{alternatives_javadoczip_install %{nil}}
|
||||
|
||||
%postun javadoc-zip
|
||||
%{postun_javadoc_zip %{nil}}
|
||||
@ -2369,6 +2373,9 @@ cjc.mainProgram(args)
|
||||
%post headless-slowdebug
|
||||
%{post_headless -- %{debug_suffix_unquoted}}
|
||||
|
||||
%posttrans headless-slowdebug
|
||||
%{alternatives_java_install -- %{debug_suffix_unquoted}}
|
||||
|
||||
%postun slowdebug
|
||||
%{postun_script -- %{debug_suffix_unquoted}}
|
||||
|
||||
@ -2404,6 +2411,9 @@ cjc.mainProgram(args)
|
||||
%posttrans fastdebug
|
||||
%{posttrans_script -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
%posttrans headless-fastdebug
|
||||
%{alternatives_java_install -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
%post devel-fastdebug
|
||||
%{post_devel -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
@ -2486,6 +2496,13 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 30 2021 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.312.b05-0.3.ea
|
||||
- alternatives creation moved to posttrans
|
||||
- Thus fixing the old reisntall issue:
|
||||
- https://bugzilla.redhat.com/show_bug.cgi?id=1200302
|
||||
- https://bugzilla.redhat.com/show_bug.cgi?id=1976053
|
||||
- Resolves: rhbz#2008202
|
||||
|
||||
* Thu Oct 07 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.312.b05-0.2.ea
|
||||
- Allow plain key import to be disabled with -Dcom.redhat.fips.plainKeySupport=false
|
||||
- Resolves: rhbz#1994676
|
||||
|
||||
Loading…
Reference in New Issue
Block a user