From dce6274166062068c71aeddfa782d0d0d9430145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 28 Feb 2018 14:25:42 +0100 Subject: [PATCH] Drop %defattr and Group lines, use https --- kernel.spec | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/kernel.spec b/kernel.spec index f3f561c5f..669f9c222 100644 --- a/kernel.spec +++ b/kernel.spec @@ -368,9 +368,8 @@ Summary: The Linux kernel Name: kernel%{?variant} -Group: System Environment/Kernel License: GPLv2 and Redistributable, no modification permitted -URL: http://www.kernel.org/ +URL: https://www.kernel.org/ Version: %{rpmversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. @@ -655,7 +654,6 @@ AutoProv: yes\ %package headers Summary: Header files for the Linux kernel for use by glibc -Group: Development/System Obsoletes: glibc-kernheaders < 3.0-46 Provides: glibc-kernheaders = 3.0-46 %if "0%{?variant}" @@ -671,7 +669,6 @@ glibc package. %package cross-headers Summary: Header files for the Linux kernel for use by cross-glibc -Group: Development/System %description cross-headers Kernel-cross-headers includes the C header files that specify the interface between the Linux kernel and userspace libraries and programs. The @@ -682,7 +679,6 @@ cross-glibc package. %package bootwrapper Summary: Boot wrapper files for generating combined kernel + initrd images -Group: Development/System Requires: gzip binutils %description bootwrapper Kernel-bootwrapper contains the wrapper code which makes bootable "zImage" @@ -690,7 +686,6 @@ files combining both kernel and initial ramdisk. %package debuginfo-common-%{_target_cpu} Summary: Kernel source files used by %{name}-debuginfo packages -Group: Development/Debug Provides: installonlypkg(kernel) %description debuginfo-common-%{_target_cpu} This package is required by %{name}-debuginfo subpackages. @@ -703,7 +698,6 @@ It provides the kernel source files common to all builds. %define kernel_debuginfo_package() \ %package %{?1:%{1}-}debuginfo\ Summary: Debug information for package %{name}%{?1:-%{1}}\ -Group: Development/Debug\ Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}\ Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{version}-%{release}\ Provides: installonlypkg(kernel)\ @@ -721,7 +715,6 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\ %define kernel_devel_package() \ %package %{?1:%{1}-}devel\ Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\ Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ @@ -742,7 +735,6 @@ against the %{?2:%{2} }kernel package.\ %define kernel_modules_extra_package() \ %package %{?1:%{1}-}modules-extra\ Summary: Extra kernel modules to match the %{?2:%{2} }kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\ @@ -763,7 +755,6 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne %define kernel_modules_package() \ %package %{?1:%{1}-}modules\ Summary: kernel modules to match the %{?2:%{2}-}core kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\ Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\ @@ -783,7 +774,6 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne %define kernel_meta_package() \ %package %{1}\ summary: kernel meta-package for the %{1} kernel\ -group: system environment/kernel\ Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\ Provides: installonlypkg(kernel)\ @@ -799,7 +789,6 @@ The meta-package for the %{1} kernel\ %define kernel_variant_package(n:) \ %package %{?1:%{1}-}core\ Summary: %{variant_summary}\ -Group: System Environment/Kernel\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ %{expand:%%kernel_reqprovconf}\ @@ -1602,7 +1591,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %ifnarch noarch %global __debug_package 1 %files -f debugfiles.list debuginfo-common-%{_target_cpu} -%defattr(-,root,root) %endif %endif @@ -1785,27 +1773,22 @@ fi %if %{with_headers} %files headers -%defattr(-,root,root) /usr/include/* %endif %if %{with_cross_headers} %files cross-headers -%defattr(-,root,root) /usr/*-linux-gnu/include/* %endif %if %{with_bootwrapper} %files bootwrapper -%defattr(-,root,root) /usr/sbin/* %{_libdir}/kernel-wrapper %endif # empty meta-package %files -%defattr(-,root,root) - # This is %%{image_install_path} on an arch where that includes ELF files, # or empty otherwise. %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}} @@ -1818,7 +1801,6 @@ fi %define kernel_variant_files(k:) \ %if %{2}\ %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\ -%defattr(-,root,root)\ %{!?_licensedir:%global license %%doc}\ %license linux-%{KVERREL}/COPYING\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\ @@ -1846,23 +1828,18 @@ fi %endif\ /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\ %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\ -%defattr(-,root,root)\ %{expand:%%files %{?3:%{3}-}devel}\ -%defattr(-,root,root)\ %defverify(not mtime)\ /usr/src/kernels/%{KVERREL}%{?3:+%{3}}\ %{expand:%%files %{?3:%{3}-}modules-extra}\ -%defattr(-,root,root)\ /lib/modules/%{KVERREL}%{?3:+%{3}}/extra\ %if %{with_debuginfo}\ %ifnarch noarch\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ -%defattr(-,root,root)\ %endif\ %endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ -%defattr(-,root,root)\ %endif\ %endif\ %{nil}