rpms
/
java-17-openjdk-portable
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed condition for taspets

This commit is contained in:
Jiri Vanek 2024-03-12 14:14:32 +01:00
parent 6b33fcf848
commit 12fb6aeabf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java-17-openjdk-portable.spec
View File

@ -327,7 +327,7 @@
%endif %endif
%ifarch %{systemtap_arches} %ifarch %{systemtap_arches}
%if (0%{?rhel} > 0) %if (0%{?rhel} > 0 && !0%{?epel})
%global with_systemtap 1 %global with_systemtap 1
%else %else
%global with_systemtap 0 %global with_systemtap 0
@ -404,7 +404,7 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7 %global buildver 7
%global rpmrelease 1 %global rpmrelease 2
#%%global tagsuffix %%{nil} #%%global tagsuffix %%{nil}
# 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
@ -567,7 +567,7 @@ ExcludeArch: %{ix86}
Name: java-%{javaver}-%{origin}-portable Name: java-%{javaver}-%{origin}-portable
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1 Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -1803,6 +1803,9 @@ done
%endif %endif
%changelog %changelog
* Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:17.0.10.0.7-2
- fixed condition for taspets
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1:17.0.10.0.7-1.1 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1:17.0.10.0.7-1.1
- Rebuilt for java-21-openjdk as system jdk - Rebuilt for java-21-openjdk as system jdk