rpms/java-17-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Indentation and other comsetic changes

Browse Source
This commit is contained in:
Jiri Vanek 2023-04-20 13:28:39 +02:00
parent 863677b546
commit c2dca7868d
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java-17-openjdk.spec
View File

@ -192,6 +192,13 @@
# RPM JDK builds keep the debug symbols internal, to be later stripped by RPM # RPM JDK builds keep the debug symbols internal, to be later stripped by RPM
%global debug_symbols internal %global debug_symbols internal
# VM variant being built
%ifarch %{zero_arches}
%global vm_variant zero
%else
%global vm_variant server
%endif
# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path # With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path
# the initialization must be here. Later the pkg-config have buggy behavior # the initialization must be here. Later the pkg-config have buggy behavior
# looks like openjdk RPM specific bug # looks like openjdk RPM specific bug
@ -850,9 +857,9 @@ exit 0
#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page #%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/ %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
%ifarch %{share_arches} %ifarch %{share_arches}
%attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/classes.jsa %attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/classes.jsa
%endif %endif
%dir %{etcjavasubdir} %dir %{etcjavasubdir}
%dir %{etcjavadir -- %{?1}} %dir %{etcjavadir -- %{?1}}
@ -1316,7 +1323,7 @@ BuildRequires: crypto-policies
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: zip BuildRequires: zip
BuildRequires: javapackages-filesystem BuildRequires: javapackages-filesystem
# 2022g required as of JDK-8297804 # ?
BuildRequires: tzdata-java >= 2022g BuildRequires: tzdata-java >= 2022g
%if %{with_systemtap} %if %{with_systemtap}
@ -1745,6 +1752,7 @@ done
done done
%build %build
%install %install
function installjdk() { function installjdk() {
local imagepath=${1} local imagepath=${1}
@ -1760,6 +1768,11 @@ function installjdk() {
find ${imagepath} -iname '*.so' -exec chmod +x {} \; find ${imagepath} -iname '*.so' -exec chmod +x {} \;
find ${imagepath}/bin/ -exec chmod +x {} \; find ${imagepath}/bin/ -exec chmod +x {} \;
# Install nss.cfg right away as we will be using the JRE above
#is already there from portables
# Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
#is already there from portables
# Turn on system security properties # Turn on system security properties
sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \ sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \
${imagepath}/conf/security/java.security ${imagepath}/conf/security/java.security
@ -1855,11 +1868,10 @@ EOF
} }
for suffix in %{build_loop} ; do for suffix in %{build_loop} ; do
if [ "x$suffix" = "x" ] ; then if [ "x$suffix" = "x" ] ; then
debugbuild="" debugbuild=""
else else
# change - something to .something # change -something to .something
debugbuild=`echo $suffix | sed "s/-/./g"` debugbuild=`echo $suffix | sed "s/-/./g"`
fi fi
# Final setup on the untarred images # Final setup on the untarred images