From 066309ebba43b6face804225c0f6d909e1b3273a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 14 Dec 2004 00:00:25 +0000 Subject: [PATCH] - support multiple '-' in EXTRAVERSION/non-dist case again Changed files: rpm.macros -> 1.180 --- rpm.macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm.macros b/rpm.macros index f9995b5..1bc80c6 100644 --- a/rpm.macros +++ b/rpm.macros @@ -235,7 +235,7 @@ unset DISPLAY ||:\ %__kernel_rel %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h --queryformat "%{RELEASE}" | grep -v "is not") %__kernel_rpmvr %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h --queryformat "%{VERSION}-%{RELEASE}" | grep -v "is not") %_kernel_ver %{__kernel_ver}%{?with_dist_kernel:%(echo %{__kernel_ver} | grep -q -e - || echo -%{__kernel_rel})} -%_kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}} | sed -e 's/-/_/') +%_kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}} | sed -e 's/-/_/g') # sgml macros %xmlcat_add() /usr/bin/xmlcatalog --noout --add nextCatalog \"\" %1 /etc/xml/catalog ; -- 2.44.0