--- builds_bin/macros 2006/12/02 17:19:10 1.1 +++ builds_bin/macros 2006/12/07 03:10:26 1.2 @@ -1,6 +1,3 @@ -# Developer environment -# This gets symlinked into /etc/rpm/macros - ## Build directory %_topdir %(echo $HOME)/rpms @@ -18,9 +15,9 @@ %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} +%distver el%{distversion} +%disttag .%{distver}.sme +%smerelease() %(echo "%{?1}%{?disttag}.%{?2}" | sed -e's|\\.$||') #---------------------------------------------------------------------