aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-05-24 18:11:42 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-05-24 18:11:42 +0000
commitc7df5b4db82f8e27e807551ab651c64cfc52f4b9 (patch)
tree0c59ae9b3f6acd43094d0c5e46c1130d5b783849
parente847c8c33f1a5e6a0042a4aae10c77e8edc46616 (diff)
downloadrpm-setup-c7df5b4db82f8e27e807551ab651c64cfc52f4b9.tar
rpm-setup-c7df5b4db82f8e27e807551ab651c64cfc52f4b9.tar.gz
rpm-setup-c7df5b4db82f8e27e807551ab651c64cfc52f4b9.tar.bz2
rpm-setup-c7df5b4db82f8e27e807551ab651c64cfc52f4b9.tar.xz
rpm-setup-c7df5b4db82f8e27e807551ab651c64cfc52f4b9.zip
- new mkrel behavior
-rw-r--r--macros.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros.in b/macros.in
index 8b80932..3816097 100644
--- a/macros.in
+++ b/macros.in
@@ -214,9 +214,9 @@
# (user may copy the following line in specfile)
%mdkversion %(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/; $_="$1$2".($3||0)' /etc/mandriva-release)
-%distsuffix mdk
+%distsuffix mdv
-%mkrel(c:) %{-c: 0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*\\D\+)?(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}
+%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?distsuffix:%distsuffix}%{?!distsuffix:mdv}%{?mandriva_release:%mandriva_release}
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\