Skip to content

Rpmbuildfix #179

Merged
merged 3 commits into from
Jul 3, 2020
Merged

Rpmbuildfix #179

merged 3 commits into from
Jul 3, 2020

Conversation

gbuloz
Copy link
Contributor

@gbuloz gbuloz commented Dec 5, 2019

Patches to fix the broken RPM build process, simplify it, and update the changelog

control/ipmitool.spec.in Outdated Show resolved Hide resolved
control/rpmmacros.in Show resolved Hide resolved
control/rpmmacros.in Show resolved Hide resolved
Makefile.am Outdated Show resolved Hide resolved
include/ipmitool/Makefile.am Outdated Show resolved Hide resolved
@gbuloz

This comment has been minimized.

@AlexanderAmelkin
Copy link
Contributor

AlexanderAmelkin commented Feb 14, 2020

Please either add new commits to the same branch or interactively rebase to master and change each commit as needed and then force-push to the same branch. Your changes will automatically appear here.

Please see https://github.com/ipmitool/ipmitool/wiki/How-to-contribute#2-contribute-the-changes

control/ipmitool.spec.in Outdated Show resolved Hide resolved
control/ipmitool.spec.in Outdated Show resolved Hide resolved
@@ -1,10 +1,13 @@
%define debug_package %{nil}

Name: ipmitool
Summary: ipmitool - Utility for IPMI control
Version: @VERSION@
Release: @RPM_RELEASE@%{?_distro:.%{_distro}}
License: BSD
Group: Utilities
Packager: Jim Mankovich <jmank@hp.com>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, while we're at it, this spec file is just a template. I don't think it needs to contain the name of Jim because the resulting RPM package will definitely NOT be packaged by him. I think there must be some macro here like those @VERSION@ and @RPM_RELEASE@ above. I just don't know which.

Copy link
Contributor Author

@gbuloz gbuloz Jun 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make it simple, as the Packager info is not mandatory, I've put a commented example :
#Packager: PackagerName <packager@example.com>

control/rpmrc Show resolved Hide resolved
@gbuloz gbuloz force-pushed the rpmbuildfix branch 3 times, most recently from 44ff6fe to 60e6a5c Compare June 24, 2020 12:57
The command "make rpm" was failing for the following reasons :
- setting the build directory to ./rpmbuild/ instead of default
  ~/rpmbuild/ was ignored.
- errors in the spec file : wrong dates and characters in the
  changelog, and unpackaged files under misc/*
- debug package built even if unneeded but failing to build because
  of missing requisites.
Using "rpmbuild -tb ipmitool-*.tar.gz" instead of 'make rpm" builds
under ~/rpmbuild/ but also fails because of the last two reasons.

Signed-off-by: Gilles Buloz <gilles.buloz@kontron.com>
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>
Updated specfile changelog according to the Changelog file

Signed-off-by: Gilles Buloz <gilles.buloz@kontron.com>
@AlexanderAmelkin AlexanderAmelkin merged commit c6a0bae into ipmitool:master Jul 3, 2020
@gbuloz gbuloz deleted the rpmbuildfix branch July 6, 2020 12:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants