Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates so that RPMs build on both RHEL7 and Fedora Core 31 #28

Open
wants to merge 17 commits into
base: master
Choose a base branch
from

Conversation

markgalassi
Copy link

Some cleanup which allows the building of RPMs on those two platforms. There are still problems with the python RPMs: I have disabled them and not tested them, although this does not disable python in the source distribution. So RPMs are as before but cleaner, and the source distribution should be unaffected.

Mark Galassi and others added 7 commits November 16, 2017 13:26
	* configure.ac: releasing version 1.5.16.

	* libLanlGeoMag/Makefile.am (EXTRA_DIST): took the Images
	directory out of this list because it makes the tarball
	distribution too big.
	* Doxyfile: added USE_MATHJAX, the compact latex option, and the
	amsmath package, which is needed for the \text{'} that comes up
	occasionally in the doxygen docs.

	* Doc/LanlGeoMag.tag.in, configure.ac: the LanlGeoMag.tag file was
	required for "make dist" but did not exist.  I have added it,
	built from a .in file so it can have a version number in it.
	Modified configure.ac to generate Doc/LanlGeoMag.tag from
	Doc/LanlGeoMag.tag.in
	* Makefile.am (EXTRA_DIST): re-added the Images directory that was
	commented out.  This is necessary for a "make install" from the
	tarball to work.

	* lanlgeomag.spec.in: added some Requires and BuildRequires, and
	took out the requirement for Perl since we configure with
	--disable-perl.  Also started using appropriate RPM macros.

	* configure.ac: updated THE_PKG_RELEASE to 7; this affects the RPM
	package release number.
	* libLanlGeoMag/Makefile.am: took out again the Images/ directory
	because it makes tarballs and RPMs too big (on the order of 300meg
	instead of 50meg).
@drsteve
Copy link
Owner

drsteve commented Nov 5, 2019

Thanks @markgalassi - the default approach to PRs is that we use a rebase strategy. Your PR appears to have a couple of merge commits that make it incompatible with the revision history of drsteve/master and so it can't be accepted.

Can I ask you to resolve the conflicts? See WORKFLOW.md in the repo for the preferred approach. Right now, I think the cleanest thing to do is probably to check out a new feature branch from the last shared commit, then cherry-pick the commits that actually modify code (or generate and apply patches), push that branch and send a new PR.

Then to clean up your repo, check out the master branch again and do a hard reset to the last shared commit. Then you can rebase your master against drsteve/master once the PR is accepted. I'd recommend changing your repo settings to rebase on pull by default:
git config pull.rebase true
should do it.

If you wanted to just fix this PR (rather than start a new one) then I'd make a new feature branch, reset master to the last shared commit, then cherry-pick the commits you need back onto master. Then force push to update the PR. You'll still need to clean up your master branch after the PR is accepted as the commit hashes may not line up.

I just have one question about the actual changes:

  • On line 28 of configure.ac you have a comment after defining THE_PKG_RELEASE. Does autotools ignore everything after the first whitespace? Or does the formatting need fixing?

markgalassi and others added 5 commits March 30, 2020 01:03
	* Makefile.am (EXTRA_DIST): added README.md -- with this last
	touch "make distcheck" works!

	* libLanlGeoMag/Makefile.am (uninstall-hook): fixed permissions so
	that we can correctly remove these files.

	* configure.ac: made the default to disable perl so that one can
	use make distcheck.

	* configure.ac, Makefile.am: adjusted the way doxygen is handled
	so that "make dist" works (it was broken before).  Also added a
	rule to make README from README.md so that the GNU coding
	standards are satisfied.
	* libLanlGeoMag/Makefile.am (pkgconfigdir): changed to be
	$(prefix)/lib/pkgconfig since libdir is sometimes set (for example
	during debian builds) to $(prefix)/lib/x86_64_bla_bla/ and this is
	not OK for the pkgconfig file lgm.pc
	* libLanlGeoMag/Makefile.am (pkgconfigdir): chaged from
	$(prefix)/lib/pkgconfig to $(prefix)/share/pkgconfig.

	* Makefile.am (DEBIAN_EXTRA_DIST, EXTRA_DIST): added debian
	distribution files.
@drsteve drsteve force-pushed the master branch 3 times, most recently from b024da6 to de532b9 Compare July 21, 2022 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants