rpms/kernel/devel kernel.spec,1.2,1.3

Thu Jul 12 20:57:48 UTC 2007

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17956

Modified Files:
	kernel.spec 
Log Message:
Fixes for a number of rpmlint warnings and errors (50 down, 500 to go...)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- kernel.spec	12 Jul 2007 20:23:03 -0000	1.2
+++ kernel.spec	12 Jul 2007 20:57:16 -0000	1.3
@@ -173,6 +173,7 @@
 %if !%{with_debuginfo}
 %define _enable_debug_packages 0
 %endif
+%define debuginfodir /usr/lib/debug
 
 # if requested, only build base kernel
 %if %{with_baseonly}
@@ -395,6 +396,7 @@
 Name: kernel%{?variant}
 Group: System Environment/Kernel
 License: GPLv2
+URL: http://www.kernel.org/
 Version: %{rpmversion}
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
@@ -404,7 +406,7 @@
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 # We can't let RPM do the dependencies automatic because it'll then pick up
@@ -417,10 +419,10 @@
 #
 # List the packages used during the kernel build
 #
-BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
-BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
+BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
+BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
 %if %{with_modsign}
-BuildPreReq: gnupg
+BuildRequires: gnupg
 %endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 %if %{usesparse}
@@ -630,7 +632,7 @@
 Group: System Environment/Kernel
 AutoReqProv: no
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 %description devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
@@ -642,7 +644,7 @@
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}smp
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 # upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise
@@ -676,7 +678,7 @@
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
 Provides: kernel-devel = %{rpmversion}-%{release}smp
 AutoReqProv: no
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 %description smp-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the SMP kernel package.
@@ -689,7 +691,7 @@
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}PAE
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Obsoletes: kernel-smp < 2.6.17
@@ -720,7 +722,7 @@
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}PAE
 Provides: kernel-devel = %{rpmversion}-%{release}PAE
 AutoReqProv: no
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 %description PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the PAE kernel package.
@@ -733,7 +735,7 @@
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}PAE-debug
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 AutoReq: no
@@ -760,7 +762,7 @@
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 Provides: kernel-PAE-debug-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}PAE-debug
 Provides: kernel-devel = %{rpmversion}-%{release}PAE-debug
@@ -803,7 +805,7 @@
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}debug
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 AutoReq: no
@@ -830,7 +832,7 @@
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 Provides: kernel-debug-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}debug
 Provides: kernel-devel = %{rpmversion}-%{release}debug
@@ -845,7 +847,7 @@
 Group: System Environment/Kernel
 Provides: kernel = %{version}
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
@@ -874,7 +876,7 @@
 Provides: kernel-xen-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen
 Provides: kernel-devel = %{rpmversion}-%{release}xen
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 %description xen-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
@@ -886,7 +888,7 @@
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}kdump
-Prereq: %{kernel_prereq}
+Requires(pre): %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 # We can't let RPM do the dependencies automatic because it'll then pick up
@@ -915,7 +917,7 @@
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}kdump
 Provides: kernel-devel = %{rpmversion}-%{release}kdump
 AutoReqProv: no
-Prereq: /usr/bin/find
+Requires(pre): /usr/bin/find
 %description kdump-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kdump kernel package.
@@ -1361,8 +1363,8 @@
 
     # Start installing the results
 %if %{with_debuginfo}
-    mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot
-    mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/%{image_install_path}
+    mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/boot
+    mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
 %endif
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
@@ -1445,8 +1447,8 @@
     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
     #
 %if %{with_debuginfo}
-    mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
-    cp vmlinux $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
+    mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
+    cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
 %endif
 
     find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
@@ -1593,11 +1595,11 @@
 %endif
 %endif
 %dir /usr/src/debug
-%dir /usr/lib/debug
-%dir /usr/lib/debug/%{image_install_path}
-%dir /usr/lib/debug/lib
-%dir /usr/lib/debug/lib/modules
-%dir /usr/lib/debug/usr/src/kernels
+%dir %{debuginfodir}
+%dir %{debuginfodir}/%{image_install_path}
+%dir %{debuginfodir}/lib
+%dir %{debuginfodir}/lib/modules
+%dir %{debuginfodir}/usr/src/kernels
 %endif
 %endif
 
@@ -1888,10 +1890,10 @@
 %files debuginfo
 %defattr(-,root,root)
 %if "%{elf_image_install_path}" != ""
-/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}.debug
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-%{_target_cpu}
+%{debuginfodir}/lib/modules/%{KVERREL}
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-%{_target_cpu}
 %endif
 %endif
 
@@ -1932,10 +1934,10 @@
 %files debug-debuginfo
 %defattr(-,root,root)
 %if "%{elf_image_install_path}" != ""
-/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}debug.debug
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}debug.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}debug
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-debug-%{_target_cpu}
+%{debuginfodir}/lib/modules/%{KVERREL}debug
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-debug-%{_target_cpu}
 %endif
 
 %files debug
@@ -1971,10 +1973,10 @@
 %files PAE-debuginfo
 %defattr(-,root,root)
 %if "%{elf_image_install_path}" != ""
-/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}PAE.debug
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}PAE.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}PAE
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu}
+%{debuginfodir}/lib/modules/%{KVERREL}PAE
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu}
 %endif
 %endif
 
@@ -2007,10 +2009,10 @@
 %files PAE-debug-debuginfo
 %defattr(-,root,root)
 %if "%{elf_image_install_path}" != ""
-/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}PAE-debug.debug
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}PAE-debug.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}PAE-debug
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu}
+%{debuginfodir}/lib/modules/%{KVERREL}PAE-debug
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu}
 %endif
 
 %files PAE-debug
@@ -2047,10 +2049,10 @@
 %files smp-debuginfo
 %defattr(-,root,root)
 %if "%{elf_image_install_path}" != ""
-/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}smp.debug
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}smp.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}smp
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-smp-%{_target_cpu}
+%{debuginfodir}/lib/modules/%{KVERREL}smp
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-smp-%{_target_cpu}
 %endif
 %endif
 
@@ -2086,11 +2088,11 @@
 %files xen-debuginfo
 %defattr(-,root,root)
 %if "%{elf_image_install_path}" != ""
-/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}xen.debug
+%{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}xen.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}xen
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
-/usr/lib/debug/boot/xen*-%{KVERREL}.debug
+%{debuginfodir}/lib/modules/%{KVERREL}xen
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+%{debuginfodir}/boot/xen*-%{KVERREL}.debug
 %endif
 %endif
 
@@ -2128,10 +2130,10 @@
 %files kdump-debuginfo
 %defattr(-,root,root)
 %if "%{image_install_path}" != ""
-/usr/lib/debug/%{image_install_path}/*-%{KVERREL}kdump.debug
+%{debuginfodir}/%{image_install_path}/*-%{KVERREL}kdump.debug
 %endif
-/usr/lib/debug/lib/modules/%{KVERREL}kdump
-/usr/lib/debug/usr/src/kernels/%{KVERREL}-kdump-%{_target_cpu}
+%{debuginfodir}/lib/modules/%{KVERREL}kdump
+%{debuginfodir}/usr/src/kernels/%{KVERREL}-kdump-%{_target_cpu}
 %endif
 %endif
 


