From bc13db630478642b9585122a4a4005511832a50d Mon Sep 17 00:00:00 2001 From: Gilles Buloz Date: Wed, 24 Jun 2020 14:55:28 +0200 Subject: 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 --- Makefile.am | 10 ++-------- configure.ac | 1 - control/Makefile.am | 4 ++-- control/ipmitool.spec.in | 3 ++- control/rpmmacros.in | 11 ----------- control/rpmrc | 8 -------- 6 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 control/rpmmacros.in delete mode 100644 control/rpmrc diff --git a/Makefile.am b/Makefile.am index 4fdb3c1..ce3267f 100644 --- a/Makefile.am +++ b/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 - mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp} - 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 +rpm: dist + @RPMBUILD@ -ta --define "_topdir $(RPMDIR)" $(distdir).tar.gz .PHONY: clean-rpm clean-rpm: diff --git a/configure.ac b/configure.ac index 94018d3..9dbc390 100644 --- a/configure.ac +++ b/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 diff --git a/control/Makefile.am b/control/Makefile.am index 91950d6..7913312 100644 --- a/control/Makefile.am +++ b/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 diff --git a/control/ipmitool.spec.in b/control/ipmitool.spec.in index 31a7171..7a0f10d 100644 --- a/control/ipmitool.spec.in +++ b/control/ipmitool.spec.in @@ -6,7 +6,8 @@ Version: @VERSION@ Release: @RPM_RELEASE@%{?_distro:.%{_distro}} License: BSD Group: Utilities -Packager: Jim Mankovich +#Packager: PackagerName +Distribution: GitHub Build Source: %{name}-%{version}.tar.gz Buildroot: /var/tmp/ipmitool-root diff --git a/control/rpmmacros.in b/control/rpmmacros.in deleted file mode 100644 index 09883a6..0000000 --- a/control/rpmmacros.in +++ /dev/null @@ -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 diff --git a/control/rpmrc b/control/rpmrc deleted file mode 100644 index 0a99ecb..0000000 --- a/control/rpmrc +++ /dev/null @@ -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 - -- cgit v1.2.1