From a892bb499a694f961dcbfe215d9bde9248e71be7 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Thu, 16 Jun 2005 23:56:32 +0000
Subject: [PATCH] add configure option for specifying a distro tag for "make
 rpm" builds

---
 ipmitool/configure.in                        | 9 ++++++++-
 ipmitool/control/Makefile.am                 | 6 +++---
 ipmitool/control/ipmitool.spec.in            | 1 +
 ipmitool/control/{rpmmacros => rpmmacros.in} | 1 +
 4 files changed, 13 insertions(+), 4 deletions(-)
 rename ipmitool/control/{rpmmacros => rpmmacros.in} (95%)

diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 0ab7eed..b4295c9 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -3,7 +3,7 @@ dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.2])
+AM_INIT_AUTOMAKE([ipmitool], [1.8.3])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
@@ -194,6 +194,12 @@ AC_CHECK_HEADER([linux/ipmi.h],
 	[Define to 1 if you have the <linux/ipmi.h> header file.])],
 	[echo "** Unable to find OpenIPMI header files.  Using internal version."])
 
+dnl set RPM distro tag for use in RPM name
+AC_ARG_WITH([rpm-distro],
+	[AC_HELP_STRING([--with-rpm-distro=DISTRO],
+			[set Linux distribution tag for use in RPM version string])],
+	[AC_SUBST(DISTRO, $with_rpm_distro)])
+
 dnl enable Linux OpenIPMI interface
 AC_ARG_ENABLE([intf-open],
 	[AC_HELP_STRING([--enable-intf-open],
@@ -291,6 +297,7 @@ AC_CONFIG_FILES([Makefile
 		control/Makefile
 		control/pkginfo
 		control/prototype
+		control/rpmmacros
 		control/ipmitool.spec
 		lib/Makefile
 		include/Makefile
diff --git a/ipmitool/control/Makefile.am b/ipmitool/control/Makefile.am
index 4b107d8..d999d91 100644
--- a/ipmitool/control/Makefile.am
+++ b/ipmitool/control/Makefile.am
@@ -34,8 +34,8 @@
 
 MAINTAINERCLEANFILES	= Makefile.in
 
-EXTRA_DIST		= pkginfo.in prototype.in ipmitool.spec.in \
-			  rpmrc rpmmacros
+EXTRA_DIST		= pkginfo.in prototype.in \
+			  ipmitool.spec.in rpmmacros.in rpmrc
 
-dist-hook: pkginfo prototype
+dist-hook: pkginfo prototype rpmmacros
 
diff --git a/ipmitool/control/ipmitool.spec.in b/ipmitool/control/ipmitool.spec.in
index a4a0577..65f71ef 100644
--- a/ipmitool/control/ipmitool.spec.in
+++ b/ipmitool/control/ipmitool.spec.in
@@ -32,6 +32,7 @@ fi
 
 %build
 ./configure --with-kerneldir \
+	--with-rpm-distro=@DISTRO@ \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
 	--sbindir=%{_sbindir} \
diff --git a/ipmitool/control/rpmmacros b/ipmitool/control/rpmmacros.in
similarity index 95%
rename from ipmitool/control/rpmmacros
rename to ipmitool/control/rpmmacros.in
index c550bac..f41d111 100644
--- a/ipmitool/control/rpmmacros
+++ b/ipmitool/control/rpmmacros.in
@@ -6,6 +6,7 @@
 %_buildroot	%{_topdir}/%{_tmppath}/%{name}-%{version}-root
 %_rpmdir	%{_topdir}/RPMS
 %_srcrpmdir	%{_topdir}/SRPMS
+%_distro	@DISTRO@
 %_rpmfilename	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
 %packager	duncan@iceblink.org
 %distribution	Sourceforge Build