X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=337c80c7347cfd91b6ca17539511af77e0b0d0ab;hb=6a1fdb8f711df130b4d467f66299afbea09a0ed1;hp=8f0e7095b7017ea5a46d598a68626b86962634a1;hpb=4943ae1975dcd056143db2b31663414c9b1981a7;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 8f0e709..337c80c 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -28,20 +28,16 @@
 # as an alternative to this implementation we could simply "make -C $kdir kernelversion"
 %{!?kversion: %global kversion %(files="include/generated/utsrelease.h include/linux/utsrelease.h include/linux/version.h"; for f in $files; do if test -r %{kobjdir}/$f && grep UTS_RELEASE %{kobjdir}/$f >/dev/null; then sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %{kobjdir}/$f; break; fi; done)}
 
-%define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi)
-
 %if 0%{?build_src_rpm}
     %{!?myrelease: %global myrelease 1}
 %else
-    %{!?downstream_release: %global downstream_release "@DOWNSTREAM_RELEASE@"}
-    %{!?myrelease: %global myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')}
+    %{!?myrelease: %global myrelease %(echo %kversion | tr '-' '_')}
     # for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
     # of %kversion
     %define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/-default$//')
 %endif
 
-# always append the buildid, even when the caller defines %release
-%define fullrelease %{myrelease}%{buildid}
+%define fullrelease %{myrelease}
 
 # in order to get kernel symset and/or kernel module dependencies into
 # the RPM, in order to support weak-modules, the internal dependency gen-