aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-08-31 16:04:32 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-08-31 16:04:32 +0000
commitef5b4a7fb8fe66145495521d54c10b94b362b8c5 (patch)
tree12c469a4ed5178297a7b835803db8203408e5039
parent5e70093e0ff26e2925dd9cd236b12b929338e10b (diff)
- revert last change, broken (thx warly)1.29
-rw-r--r--configure.ac2
-rw-r--r--macros.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index c1f2439..6db4877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.28, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.29, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
diff --git a/macros.in b/macros.in
index 557e2c0..57b5cf6 100644
--- a/macros.in
+++ b/macros.in
@@ -281,7 +281,7 @@ then %{_scrollkeeper_bin} -q || true ; fi \
%distsuffix mdv
-%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:mdv}%{?mandriva_release:%mandriva_release}
+%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?distsuffix:%distsuffix}%{?!distsuffix:mdv}%{?mandriva_release:%mandriva_release}%{?subrel:.%subrel}
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\