From c9631855be3c56650b7bda2caa8b1e9a5a199aed Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: May 05 2023 13:03:15 +0000 Subject: Remove obsolete rpm spec constructs defattr does not need to be specified anymore buildroot does not need to be specified anymore Signed-off-by: Michal Suchanek --- diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 2fa7cdc..0876c9b 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -247,7 +247,6 @@ Provides: %name-srchash-@COMMIT_FULL@ %obsolete_rebuilds %name @SOURCES@ -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -1161,7 +1160,6 @@ fi --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: @SUMMARY@ - Unsupported kernel modules @@ -1225,7 +1223,6 @@ This package contains additional modules not supported by SUSE. %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1287,7 +1284,6 @@ This package contains optional modules only for openSUSE Leap. --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1303,7 +1299,6 @@ kmsg message documentation comments. %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1320,7 +1315,6 @@ from this package. %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1370,7 +1364,6 @@ fi relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1407,7 +1400,6 @@ static, unlike the %{patch_package}--flavor package names. %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1475,7 +1467,6 @@ Supplements: packageand(%name:%@KMP_NAME@-%build_flavor) --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n @KMP_NAME@-%build_flavor -f @KMP_NAME@.files -%defattr(-, root, root) # END KMP %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES diff --git a/rpm/kernel-docs.spec.in b/rpm/kernel-docs.spec.in index 9a20883..0aade07 100644 --- a/rpm/kernel-docs.spec.in +++ b/rpm/kernel-docs.spec.in @@ -68,7 +68,6 @@ URL: https://www.kernel.org/ Provides: %name = %version-%source_rel Provides: %name-srchash-@COMMIT_FULL@ BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build @SOURCES@ %description @@ -131,7 +130,6 @@ done %endif %files -%defattr(-,root,root) %if 0%{?suse_version} && 0%{?suse_version} < 1500 %doc COPYING %else @@ -141,7 +139,6 @@ done %if %build_pdf %files pdf -%defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/pdf %{_datadir}/doc/kernel/pdf @@ -149,7 +146,6 @@ done %if %build_html %files html -%defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/html %{_datadir}/doc/kernel/html diff --git a/rpm/kernel-obs-qa.spec.in b/rpm/kernel-obs-qa.spec.in index 4473e3e..5822e3c 100644 --- a/rpm/kernel-obs-qa.spec.in +++ b/rpm/kernel-obs-qa.spec.in @@ -29,10 +29,6 @@ BuildRequires: kernel-default BuildRequires: kernel-obs-build BuildRequires: modutils ExclusiveArch: @ARCHS@ -%if 0%{?suse_version} < 1200 -# for SLE 11 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES @@ -71,7 +67,6 @@ mkdir -p %{buildroot}/usr/share/%name touch %{buildroot}/usr/share/%name/logfile %files -%defattr(-,root,root) /usr/share/%name %changelog diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in index 0f74e3d..e99b865 100644 --- a/rpm/kernel-source.spec.in +++ b/rpm/kernel-source.spec.in @@ -303,16 +303,13 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant relink linux-%kernelrelease%variant /usr/src/linux%variant %files -f nondevel.files -%defattr(-, root, root) %files -n kernel-devel%variant -f devel.files -%defattr(-,root,root) %ghost /usr/src/linux%variant %doc /usr/share/doc/packages/* %if "%variant" == "" %files -n kernel-macros -%defattr(-,root,root) %{_rpmmacrodir}/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage %dir /usr/lib/rpm/kernel @@ -323,7 +320,6 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant %if %do_vanilla %files vanilla -%defattr(-, root, root) /usr/src/linux-%kernelrelease-vanilla %endif diff --git a/rpm/kernel-syms.spec.in b/rpm/kernel-syms.spec.in index f56619f..7942cc0 100644 --- a/rpm/kernel-syms.spec.in +++ b/rpm/kernel-syms.spec.in @@ -45,7 +45,6 @@ Provides: %name-srchash-@COMMIT_FULL@ Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ Prefix: /usr/src @@ -70,7 +69,6 @@ package dependencies. install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %files -%defattr(-, root, root) %dir %_docdir/%name %_docdir/%name/README.SUSE