diff --git a/SPECS/kernel-5.15.spec b/SPECS/kernel-5.15.spec index 68a17f3..1b55552 100755 --- a/SPECS/kernel-5.15.spec +++ b/SPECS/kernel-5.15.spec @@ -1,7 +1,7 @@ %global __spec_install_pre %{___build_pre} # Define the version of the Linux Kernel Archive tarball. -%define LKAver 5.15.51 +%define LKAver 5.15.71 # Define the buildid, if required. #define buildid . @@ -111,23 +111,6 @@ # Three sets of minimum package version requirements in the form of Conflicts. # -# -# First the general kernel required versions, as per Documentation/Changes. -# -%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5 - -# -# Then a series of requirements that are distribution specific, either -# because we add patches for something or the older versions have -# problems with the newer kernel or lack certain things that make -# integration in the distro harder than needed. -# -%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3 - -# We moved the drm include files into kernel-headers, make sure there's -# a recent enough libdrm-devel on the system that doesn't have those. -%define kernel_headers_conflicts libdrm-devel < 2.4.0-0.15 - # # Packages that need to be installed before the kernel because the %%post scripts make use of them. # @@ -162,8 +145,6 @@ Requires(pre): %{initrd_prereq} Requires(pre): linux-firmware >= 20100806-2 Requires(post): %{_sbindir}/new-kernel-pkg Requires(preun): %{_sbindir}/new-kernel-pkg -Conflicts: %{kernel_dot_org_conflicts} -Conflicts: %{package_conflicts} # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function