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

using icons from source package

Browse Source 
- providing full sources via src package
- requiring exact version.reelase of portables
- returned libsystemconf.so
This commit is contained in:
Jiri Vanek 2023-04-20 15:09:40 +02:00
parent c2dca7868d
commit b0bcd88d07
1 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
java-17-openjdk.spec
View File

@ -317,7 +317,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 10 %global buildver 10
%global rpmrelease 4 %global rpmrelease 5
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk %if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@ -1033,6 +1033,7 @@ exit 0
%define files_src() %{expand: %define files_src() %{expand:
%license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/src.zip %{_jvmdir}/%{sdkdir -- %{?1}}/lib/src.zip
%{_jvmdir}/%{sdkdir -- %{?1}}/full_sources
} }
%define files_static_libs() %{expand: %define files_static_libs() %{expand:
@ -1228,6 +1229,8 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
%global __jar_repack 0 %global __jar_repack 0
%global portable_name %{name}-portable %global portable_name %{name}-portable
# the version must match, but sometmes we need to more precise, so including release
%global portable_version %{version}-3
Name: java-17-%{origin} Name: java-17-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
@ -1289,29 +1292,29 @@ Source16: CheckVendor.java
# Ensure translations are available for new timezones # Ensure translations are available for new timezones
Source18: TestTranslations.java Source18: TestTranslations.java
BuildRequires: %{portable_name}-sources >= %{portable_version}
%if %{include_normal_build} %if %{include_normal_build}
BuildRequires: %{portable_name} >= %{version} BuildRequires: %{portable_name} >= %{portable_version}
BuildRequires: %{portable_name}-devel >= %{version} BuildRequires: %{portable_name}-devel >= %{portable_version}
%if %{include_staticlibs} %if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs >= %{version} BuildRequires: %{portable_name}-static-libs >= %{portable_version}
%endif %endif
%endif %endif
%if %{include_fastdebug_build} %if %{include_fastdebug_build}
BuildRequires: %{portable_name}-fastdebug >= %{version} BuildRequires: %{portable_name}-fastdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-fastdebug >= %{version} BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version}
%if %{include_staticlibs} %if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-fastdebug >= %{version} BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version}
%endif %endif
%endif %endif
%if %{include_debug_build} %if %{include_debug_build}
BuildRequires: %{portable_name}-slowdebug >= %{version} BuildRequires: %{portable_name}-slowdebug >= %{portable_version}
BuildRequires: %{portable_name}-devel-slowdebug >= %{version} BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version}
%if %{include_staticlibs} %if %{include_staticlibs}
BuildRequires: %{portable_name}-static-libs-slowdebug >= %{version} BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version}
%endif %endif
%endif %endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# elfutils only are OK for build without AOT # elfutils only are OK for build without AOT
BuildRequires: elfutils-devel BuildRequires: elfutils-devel
@ -1683,25 +1686,27 @@ if [ $prioritylength -ne 8 ] ; then
echo "priority must be 8 digits in total, violated" echo "priority must be 8 digits in total, violated"
exit 14 exit 14
fi fi
tar -xf %{_jvmdir}/%{compatiblename}*portable.sources.noarch.tar.xz
%if %{include_normal_build} %if %{include_normal_build}
tar -xf %{_jvmdir}/%{compatiblename}*portable.jdk.*tar.xz tar -xf %{_jvmdir}/%{compatiblename}*portable.jdk.%{_arch}.tar.xz
#tar -xf %{_jvmdir}/%{compatiblename}*portable.jre.*tar.xz #tar -xf %{_jvmdir}/%{compatiblename}*portable.jre.%{_arch}.tar.xz
%if %{include_staticlibs} %if %{include_staticlibs}
tar -xf %{_jvmdir}/%{compatiblename}*portable.static-libs.*tar.xz tar -xf %{_jvmdir}/%{compatiblename}*portable.static-libs.%{_arch}.tar.xz
%endif %endif
%endif %endif
%if %{include_fastdebug_build} %if %{include_fastdebug_build}
tar -xf %{_jvmdir}/%{compatiblename}*portable.fastdebug.jdk.*tar.xz tar -xf %{_jvmdir}/%{compatiblename}*portable.fastdebug.jdk.%{_arch}.tar.xz
#tar -xf %{_jvmdir}/%{compatiblename}*portable.fastdebug.jre.*tar.xz #tar -xf %{_jvmdir}/%{compatiblename}*portable.fastdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs} %if %{include_staticlibs}
tar -xf %{_jvmdir}/%{compatiblename}*portable.fastdebug.static-libs.*tar.xz tar -xf %{_jvmdir}/%{compatiblename}*portable.fastdebug.static-libs.%{_arch}.tar.xz
%endif %endif
%endif %endif
%if %{include_debug_build} %if %{include_debug_build}
tar -xf %{_jvmdir}/%{compatiblename}*portable.slowdebug.jdk.*tar.xz tar -xf %{_jvmdir}/%{compatiblename}*portable.slowdebug.jdk.%{_arch}.tar.xz
#tar -xf %{_jvmdir}/%{compatiblename}*portable.slowdebug.jre.*tar.xz #tar -xf %{_jvmdir}/%{compatiblename}*portable.slowdebug.jre.%{_arch}.tar.xz
%if %{include_staticlibs} %if %{include_staticlibs}
tar -xf %{_jvmdir}/%{compatiblename}*portable.slowdebug.static-libs.*tar.xz tar -xf %{_jvmdir}/%{compatiblename}*portable.slowdebug.static-libs.%{_arch}.tar.xz
%endif %endif
%endif %endif
@ -1905,14 +1910,25 @@ for suffix in %{build_loop} ; do
fi fi
buildoutputdir=`ls -d %{compatiblename}*portable${debugbuild}.jdk*` buildoutputdir=`ls -d %{compatiblename}*portable${debugbuild}.jdk*`
top_dir_abs_main_build_path=$(pwd)/${buildoutputdir} top_dir_abs_main_build_path=$(pwd)/${buildoutputdir}
%if %{include_staticlibs} %if %{include_staticlibs}
top_dir_abs_staticlibs_build_path=`ls -d $top_dir_abs_main_build_path/lib/static/*/glibc/` top_dir_abs_staticlibs_build_path=`ls -d $top_dir_abs_main_build_path/lib/static/*/glibc/`
%endif %endif
jdk_image=${top_dir_abs_main_build_path} jdk_image=${top_dir_abs_main_build_path}
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
# Install the jdk # Install the jdk
mkdir -p $RPM_BUILD_ROOT%{_jvmdir} mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
# Install icons
for s in 16 24 32 48 ; do
install -D -p -m 644 \
${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix} cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
cp -a ${src_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources
pushd ${jdk_image} pushd ${jdk_image}
@ -1973,16 +1989,6 @@ commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix}
install -d -m 755 ${commondocdir} install -d -m 755 ${commondocdir}
cp -a ${top_dir_abs_main_build_path}/NEWS ${commondocdir} cp -a ${top_dir_abs_main_build_path}/NEWS ${commondocdir}
# Install icons and menu entries
for s in 16 24 32 48 ; do
# TODO!! publish in portables!
mkdir -p ${buildoutputdir}/src/java.desktop/unix/classes/sun/awt/X11/ #remove this line to once published
echo "PALCEHOLDER TODO REMOVE.ME" > ${buildoutputdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png
install -D -p -m 644 \
${buildoutputdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png
done
# Install desktop files # Install desktop files
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
for e in jconsole$suffix ; do for e in jconsole$suffix ; do
@ -2344,6 +2350,12 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Wed Apr 19 2023 Jiri Vanek <jvanek@redhat.com> - 1:17.0.6.0.10-5
- using icons from source package
- providing full sources via src package
- requiring exact version.reelase of portables
- returned libsystemconf.so
* Mon Jan 30 2023 Jiri Vanek <jvanek@redhat.com> - 1:17.0.6.0.10-4 * Mon Jan 30 2023 Jiri Vanek <jvanek@redhat.com> - 1:17.0.6.0.10-4
- repacked bits are now requested in exact version - repacked bits are now requested in exact version