--- builds_bin/macros	2006/12/02 17:19:10	1.1
+++ builds_bin/macros	2006/12/07 16:27:24	1.3
@@ -1,6 +1,3 @@
-# Developer environment
-# This gets symlinked into /etc/rpm/macros
-
 ## Build directory
 %_topdir %(echo $HOME)/rpms
 
@@ -17,10 +14,8 @@
 %_smp_mflags -j5
 
 %distversion %(rpm -qf --qf='%{VERSION}' /etc/redhat-release)
-%distname %(grep -i fedora /etc/redhat-release >/dev/null && echo "Fedora Core" || echo "Red Hat Linux")
-%disttag el%{distversion}
-%dist .2.%disttag.sme
-%smerelease() %{?1}%{?dist}
+%dist .el%{distversion}.sme
+%smerelease() %(echo "%{?1}%{?dist}.%{?2}" | sed -e's|\\.$||')
 
 #---------------------------------------------------------------------