RPM support: simplified build process

Simplified target "rpm" of Makefile, and removed rpmrc and rpmmacros to use
default settings and those from the spec file such as Distribution that has
been changed to "GitHub Build" instead of "Sourceforge Build".

Signed-off-by: Gilles Buloz <gilles.buloz@kontron.com>

Makefile.am

@@ -101,14 +101,8 @@ SRCDIR   = ${shell cd $(top_srcdir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'}
 RPMDIR   = $(BUILDDIR)/rpmbuild
 
 .PHONY: rpm
-rpm: control/ipmitool.spec dist
+rpm: dist
-	mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp}
+	@RPMBUILD@ -ta --define "_topdir $(RPMDIR)" $(distdir).tar.gz
-	cp control/ipmitool.spec $(RPMDIR)/SPECS
-	cp $(distdir).tar.gz $(RPMDIR)/SOURCES
-	CONFIGDIR=$(BUILDDIR)/control \
-	  @RPMBUILD@ -ba --define "_topdir $(RPMDIR)" \
-	  --rcfile $(SRCDIR)/control/rpmrc \
-	  $(RPMDIR)/SPECS/ipmitool.spec
 
 .PHONY: clean-rpm
 clean-rpm:

configure.ac

@@ -731,7 +731,6 @@ AC_CONFIG_FILES([Makefile
 		control/Makefile
 		control/pkginfo
 		control/prototype
-		control/rpmmacros
 		control/ipmitool.spec
 		lib/Makefile
 		include/Makefile

control/Makefile.am

@@ -31,7 +31,7 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
 EXTRA_DIST		= pkginfo.in prototype.in \
-			  ipmitool.spec.in rpmmacros.in rpmrc
+			  ipmitool.spec.in
 
-dist-hook: pkginfo prototype rpmmacros
+dist-hook: pkginfo prototype
 

control/ipmitool.spec.in

@@ -6,7 +6,8 @@ Version:      @VERSION@
 Release:      @RPM_RELEASE@%{?_distro:.%{_distro}}
 License:      BSD
 Group:        Utilities
-Packager:     Jim Mankovich <jmank@hp.com>
+#Packager:    PackagerName <packager@example.com>
+Distribution: GitHub Build
 Source:       %{name}-%{version}.tar.gz
 Buildroot:    /var/tmp/ipmitool-root
 

control/rpmmacros.in

@@ -1,11 +0,0 @@
-%_sourcedir     %{_topdir}/..
-%_specdir       %{_sourcedir}
-%_tmppath	%{_topdir}/tmp
-%_builddir	%{_topdir}/BUILD
-%_buildroot	%{_topdir}/%{_tmppath}/%{name}-%{version}-root
-%_rpmdir	%{_topdir}/RPMS
-%_srcrpmdir	%{_topdir}/SRPMS
-%_distro	@DISTRO@
-%_rpmfilename	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-%packager	jmank@hp.com
-%distribution	Sourceforge Build

control/rpmrc

@@ -1,8 +0,0 @@
-macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:%(echo $CONFIGDIR)/rpmmacros
-
-buildarchtranslate: athlon: i386
-buildarchtranslate: i686: i386
-buildarchtranslate: i586: i386
-buildarchtranslate: i486: i386
-buildarchtranslate: i386: i386
-