rpms/kernel/devel kernel-2.6.spec,1.2323,1.2324

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv869

Modified Files:
	kernel-2.6.spec 
Log Message:
use %dist



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2323
retrieving revision 1.2324
diff -u -r1.2323 -r1.2324
--- kernel-2.6.spec	29 Jun 2006 02:53:05 -0000	1.2323
+++ kernel-2.6.spec	29 Jun 2006 03:09:51 -0000	1.2324
@@ -28,11 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6
-%if %{rhelbuild}
-%define tag EL
-%endif
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage
@@ -194,7 +190,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, gnupg, diffutils
+BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
+%if %{signmodules}
+BuildPreReq: gnupg
+%endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 %if %{buildheaders}
 BuildRequires: unifdef