Compare commits

..

25 Commits

Author SHA1 Message Date
Jiri
a66414d84f Merge branch 'epel9' into epel8 2024-02-17 09:24:08 +01:00
Jiri
e9c14f7d94 Merge branch 'rawhide' into epel9 2024-02-17 09:23:05 +01:00
Jiri Vanek
75cb213415 Merge branch 'epel9' into epel8 2024-02-16 17:54:09 +01:00
Jiri Vanek
0d22f72ea5 Merge branch 'rawhide' into epel9 2024-02-16 17:53:26 +01:00
Jiri Vanek
3e4ef30247 Merge branch 'epel9' into epel8 2024-01-19 16:36:36 +01:00
Jiri Vanek
b9e3f7e6c2 Merge branch 'rawhide' into epel9 2024-01-19 16:36:13 +01:00
Jiri Vanek
6648204e3a Merge branch 'epel9' into epel8 2024-01-19 13:46:20 +01:00
Jiri Vanek
9cf597b48a Merge branch 'rawhide' into epel9 2024-01-19 13:45:17 +01:00
Jiri
b32ec8553d Merge branch 'epel9' into epel8 2023-12-22 09:40:08 +01:00
Jiri
467e432e1d Merge branch 'rawhide' into epel9 2023-12-22 09:38:40 +01:00
Jiri
d7e735705c Merge branch 'epel9' into epel8 2023-12-05 13:14:38 +01:00
Jiri
7945966e03 Merge branch 'rawhide' into epel9 2023-12-05 13:11:15 +01:00
Jiri
0129f5e6dc Merge remote-tracking branch 'origin/epel9' into epel8 2023-08-05 20:18:32 +02:00
Jiri
9e39339c26 Merge remote-tracking branch 'origin/rawhide' into epel9 2023-08-05 20:15:39 +02:00
Jiri
e4c558138f Fixing date in changelog 2023-06-30 15:30:20 +02:00
Jiri
bcfcadb497 Bad changelog 2023-06-30 12:00:56 +02:00
Jiri
f937eae3e3 Bad changelog 2023-06-30 10:28:09 +02:00
Kalev Lember
9954ce23d4 Simplify portable archive name macros
Avoid using fragile regex and instead match on "%{version}-%{release}"
to do the substitutions.

This should make it both simpler (avoiding separate rhel7 conditional)
and more robust in case the build system sets a different dist tag than
what the regex expected.
2023-06-28 16:45:29 +02:00
Kalev Lember
b6d5401e2b Simplify portable archive name macros
Avoid using fragile regex and instead match on "%{version}-%{release}"
to do the substitutions.

This should make it both simpler (avoiding separate rhel7 conditional)
and more robust in case the build system sets a different dist tag than
what the regex expected.
2023-06-28 16:39:21 +02:00
Petra Mikova
963d225681 Bump rpmrelease 2023-06-21 11:34:33 +02:00
Jiri
13e6aabfbd Redeclared ForFiles release sections as %%nil no longer works with %%1
RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
so we have to pass in "" but evaluate it, otherwise files record will include it
2023-06-21 11:34:33 +02:00
Petra Mikova
a4dbc3817c Bump rpmrelease 2023-06-20 10:37:29 +02:00
Jiri
a5cdbade9c Redeclared ForFiles release sections as %%nil no longer works with %%1
RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
so we have to pass in "" but evaluate it, otherwise files record will include it
2023-06-20 09:59:34 +02:00
Petra Mikova
9c91c5b28a Fix macros to apply also to epel, lower buildjdkver 2023-05-23 10:39:01 +02:00
Petra Mikova
609807750f Fix macros to apply also to epel, lower buildjdkver 2023-05-22 14:28:12 +02:00

View File

@ -338,7 +338,7 @@
# buildjdkver is usually same as %%{featurever}, # buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1, # but in time of bootstrap of next jdk, it is featurever-1,
# and this it is better to change it here, on single place # and this it is better to change it here, on single place
%global buildjdkver 22 %global buildjdkver 21
# We don't add any LTS designator for STS packages (Fedora and EPEL). # We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel} %if 0%{?rhel} && !0%{?epel}
@ -398,7 +398,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 36 %global buildver 36
%global rpmrelease 2 %global rpmrelease 1
#%%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
@ -1780,9 +1780,6 @@ done
%endif %endif
%changelog %changelog
* Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-2.rolling
- bumped build jdk to 22
* Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-1.rolling * Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-1.rolling
- updated to 22+36 - updated to 22+36
- tmp comment out of ea exit 17 - tmp comment out of ea exit 17