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

make-dist/ceph.spec.in: Fix srpm build breakage. #10404

Merged
merged 1 commit into from Aug 31, 2016
Merged

Conversation

ilc
Copy link

@ilc ilc commented Jul 22, 2016

This allows the make-dist script to create a .spec file that
can actually use the tarball created to build srpms.

Tested on Fedora 24, using mock.

Signed-off-by: Ira Cooper ira@redhat.com

@ilc
Copy link
Author

ilc commented Jul 22, 2016

Note: This will break autotools use of ceph.spec.in.

Given that we want to remove autotools, I didn't address that issue.

@tchaikov
Copy link
Contributor

@ilc do you know where we are expected to create an srpm? just want to make sure how this change fit into our work flow. in https://github.com/ceph/ceph-build/blob/master/ceph-setup/build/build, maybe?

@ilc
Copy link
Author

ilc commented Jul 29, 2016

@liewegas , given that you authored the script I'm fixing. Care to comment on the right thing to do here?

@tchaikov
Copy link
Contributor

@ktdreyer and @liewegas ping?

@ktdreyer
Copy link
Member

Can we fix make-dist to do the right thing instead?

@liewegas
Copy link
Member

@ilc is the problem that the tarbal includes the -nnn-g$sha1 portion, and for rpm we ar eputting that not in the version string but the release string? Can we just include %release in the url? e.g.,

-Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2
+Source0: http://ceph.com/download/%{name}-%{version}-%{release}.tar.bz2

@liewegas
Copy link
Member

Oh I guess not since we have to munge - to . in the release string. Yeah, this seems okay to me.

@ktdreyer I think we really do want to stick with creating tarballs with a full version (git describe) string (by default at least).

@ktdreyer
Copy link
Member

Ok, if we're making the change consciously, then this is ok with me.

@tchaikov
Copy link
Contributor

@ilc could you rebase your commit against master to resolve the conflict?

@ilc
Copy link
Author

ilc commented Aug 23, 2016

I'll fix it. no problem. Just need a day. :)

This allows the make-dist script to create a .spec file that
can actually use the tarball created to build srpms.

Tested on Fedora 24, using mock.

Signed-off-by: Ira Cooper <ira@redhat.com>
@ilc
Copy link
Author

ilc commented Aug 23, 2016

@tchaikov Enjoy.
@liewegas Yep, you figured out why I had to make it ugly :(.

@liewegas liewegas merged commit 990a920 into ceph:master Aug 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants