Handle Fedora in distro conditionals that currently only pertain to RHEL.
This commit is contained in:
Andrew John Hughes
parent
6837909120
commit
241e828cfe
|
|
@ -298,7 +298,7 @@
|
|||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 12
|
||||
%global rpmrelease 8
|
||||
%global rpmrelease 9
|
||||
# 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
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
|
|
@ -937,7 +937,8 @@ Requires: libXcomposite%{?_isa}
|
|||
Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
# for java-X-openjdk package's desktop binding
|
||||
%if 0%{?rhel} >= 8
|
||||
# Where recommendations are available, recommend Gtk+ for the Swing look and feel
|
||||
%if 0%{?rhel} >= 8 || 0%{?fedora} > 0
|
||||
Recommends: gtk3%{?_isa}
|
||||
%endif
|
||||
|
||||
|
|
@ -978,8 +979,11 @@ Requires: cups-libs
|
|||
Requires(post): %{alternatives_requires}
|
||||
# Postun requires alternatives to uninstall tool alternatives
|
||||
Requires(postun): %{alternatives_requires}
|
||||
# for optional support of kernel stream control, card reader and printing bindings
|
||||
# Where suggestions are available, recommend the sctp and pcsc libraries
|
||||
# for optional support of kernel stream control and card reader
|
||||
%if 0%{?rhel} >= 8 || 0%{?fedora} > 0
|
||||
Suggests: lksctp-tools%{?_isa}, pcsc-lite-libs%{?_isa}
|
||||
%endif
|
||||
|
||||
# Standard JPackage base provides
|
||||
Provides: jre-%{javaver}-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -1094,7 +1098,8 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
|
|||
|
||||
Epoch: 1
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment
|
||||
%if 0%{?rhel} <= 8
|
||||
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1257,7 +1262,7 @@ The %{origin_nice} %{featurever} runtime environment.
|
|||
%if %{include_debug_build}
|
||||
%package slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1270,7 +1275,7 @@ The %{origin_nice} %{featurever} runtime environment.
|
|||
%if %{include_fastdebug_build}
|
||||
%package fastdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1283,7 +1288,7 @@ The %{origin_nice} %{featurever} runtime environment.
|
|||
%if %{include_normal_build}
|
||||
%package headless
|
||||
Summary: %{origin_nice} %{featurever} Headless Runtime Environment
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1296,7 +1301,9 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup
|
|||
%if %{include_debug_build}
|
||||
%package headless-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on}
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_headless_rpo -- %{debug_suffix_unquoted}}
|
||||
|
||||
|
|
@ -1308,7 +1315,9 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup
|
|||
%if %{include_fastdebug_build}
|
||||
%package headless-fastdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on}
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_headless_rpo -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
|
|
@ -1320,7 +1329,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup
|
|||
%if %{include_normal_build}
|
||||
%package devel
|
||||
Summary: %{origin_nice} %{featurever} Development Environment
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1333,7 +1342,7 @@ The %{origin_nice} %{featurever} development tools.
|
|||
%if %{include_debug_build}
|
||||
%package devel-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Development Environment %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1347,7 +1356,9 @@ The %{origin_nice} %{featurever} development tools.
|
|||
%if %{include_fastdebug_build}
|
||||
%package devel-fastdebug
|
||||
Summary: %{origin_nice} %{featurever} Development Environment %{fastdebug_on}
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Tools
|
||||
%endif
|
||||
|
||||
%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
|
|
@ -1396,7 +1407,7 @@ The %{origin_nice} %{featurever} libraries for static linking.
|
|||
%if %{include_normal_build}
|
||||
%package jmods
|
||||
Summary: JMods for %{origin_nice} %{featurever}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1409,7 +1420,7 @@ The JMods for %{origin_nice} %{featurever}.
|
|||
%if %{include_debug_build}
|
||||
%package jmods-slowdebug
|
||||
Summary: JMods for %{origin_nice} %{featurever} %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1423,7 +1434,9 @@ The JMods for %{origin_nice} %{featurever}.
|
|||
%if %{include_fastdebug_build}
|
||||
%package jmods-fastdebug
|
||||
Summary: JMods for %{origin_nice} %{featurever} %{fastdebug_on}
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Tools
|
||||
%endif
|
||||
|
||||
%{java_jmods_rpo -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
|
|
@ -1435,7 +1448,7 @@ The JMods for %{origin_nice} %{featurever}.
|
|||
%if %{include_normal_build}
|
||||
%package demo
|
||||
Summary: %{origin_nice} %{featurever} Demos
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1448,7 +1461,7 @@ The %{origin_nice} %{featurever} demos.
|
|||
%if %{include_debug_build}
|
||||
%package demo-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Demos %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1462,7 +1475,9 @@ The %{origin_nice} %{featurever} demos.
|
|||
%if %{include_fastdebug_build}
|
||||
%package demo-fastdebug
|
||||
Summary: %{origin_nice} %{featurever} Demos %{fastdebug_on}
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_demo_rpo -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
|
|
@ -1474,7 +1489,7 @@ The %{origin_nice} %{featurever} demos.
|
|||
%if %{include_normal_build}
|
||||
%package src
|
||||
Summary: %{origin_nice} %{featurever} Source Bundle
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1488,7 +1503,7 @@ class library source code for use by IDE indexers and debuggers.
|
|||
%if %{include_debug_build}
|
||||
%package src-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Source Bundle %{for_debug}
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
|
|
@ -1502,7 +1517,9 @@ The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_n
|
|||
%if %{include_fastdebug_build}
|
||||
%package src-fastdebug
|
||||
Summary: %{origin_nice} %{featurever} Source Bundle %{for_fastdebug}
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_src_rpo -- %{fastdebug_suffix_unquoted}}
|
||||
|
||||
|
|
@ -1514,7 +1531,7 @@ The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_n
|
|||
%if %{include_normal_build}
|
||||
%package javadoc
|
||||
Summary: %{origin_nice} %{featurever} API documentation
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Documentation
|
||||
%endif
|
||||
Requires: javapackages-filesystem
|
||||
|
|
@ -1529,7 +1546,7 @@ The %{origin_nice} %{featurever} API documentation.
|
|||
%if %{include_normal_build}
|
||||
%package javadoc-zip
|
||||
Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive
|
||||
%if 0%{?rhel} <= 8
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||
Group: Documentation
|
||||
%endif
|
||||
Requires: javapackages-filesystem
|
||||
|
|
@ -2358,7 +2375,10 @@ cjc.mainProgram(args)
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Nov 05 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.35-8
|
||||
* Mov Nov 29 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.1.0.12-9.rolling
|
||||
- Handle Fedora in distro conditionals that currently only pertain to RHEL.
|
||||
|
||||
* Fri Nov 05 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.1.0.12-8.rolling
|
||||
- Patch syslookup.c so it actually has some code to be compiled into libsyslookup
|
||||
- Related: rhbz#2013846
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue