From 700acb989f3db98e766da12dfe5b49aa81ca3638 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 13 Jul 2009 14:26:49 +0000
Subject: [PATCH] Move %{?dist} into autoconf.am

---
 contrib/crossrpms/autotools/Makefile.am | 4 ++--
 contrib/crossrpms/autotools/autoconf.am | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/crossrpms/autotools/Makefile.am b/contrib/crossrpms/autotools/Makefile.am
index 108a22c4d5..004259107a 100644
--- a/contrib/crossrpms/autotools/Makefile.am
+++ b/contrib/crossrpms/autotools/Makefile.am
@@ -5,9 +5,9 @@
 include $(top_srcdir)/mkspec.am
 
 AUTOCONF_VERS = 2.63
-AUTOCONF_RPMREL = 3%{?dist}
+AUTOCONF_RPMREL = 3
 include ./autoconf.am
 
 AUTOMAKE_VERS = 1.11
-AUTOMAKE_RPMREL = 1
+AUTOMAKE_RPMREL = 2
 include ./automake.am
diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am
index 7a3a671b54..8e0d714f54 100644
--- a/contrib/crossrpms/autotools/autoconf.am
+++ b/contrib/crossrpms/autotools/autoconf.am
@@ -9,7 +9,7 @@ autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources
 	  -e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
-	  -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
+	  -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@
 CLEANFILES += autoconf.spec.in