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

Miscellaneous spec file fixes 1 #5788

Closed
wants to merge 3 commits into from
Closed

Conversation

smithfarm
Copy link
Contributor

@smithfarm
Copy link
Contributor Author

@dachary, @Abhishekvrshny In this PR I have combined several spec file fixes. Hopefully this will reduce the amount of specfile merge conflicts you have to deal with.

@ghost
Copy link

ghost commented Sep 3, 2015

@ldachary sounds like a nice idea to me :-)

@smithfarm
Copy link
Contributor Author

Just in case anyone is wondering, we had a large number of spec file fixes in master recently. They need to be backported, but backporting them individually is problematic (merge conflicts).

@ghost
Copy link

ghost commented Sep 4, 2015

@smithfarm clustering them into a single pull request makes a lot of sense, good idea ! You may want to update the pull request title to reflect that.

@smithfarm smithfarm changed the title ceph.spec.in: rgw placeholder dirs are not packaged Miscellaneous spec file fixes 2 Sep 4, 2015
@smithfarm smithfarm changed the title Miscellaneous spec file fixes 2 Miscellaneous spec file fixes 1 Sep 4, 2015
ghost pushed a commit that referenced this pull request Oct 2, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost pushed a commit that referenced this pull request Oct 3, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
smithfarm and others added 3 commits October 3, 2015 14:24
Given ceph's reputation for voluminous logs, it makes sense for
logrotate to be a hard dependency for all distros.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0734cd1)
0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
CentOS defines that macro for compatibility with RHEL.

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 46404dd)

Conflicts:
	ceph.spec.in
            ceph#4068 has not been backported
Automatically create /var/lib/ceph/radosgw with the
ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
via the ceph package.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
(cherry picked from commit bf93128)

Conflicts:
    ceph.spec.in
        hammer uses %ghost
ghost pushed a commit that referenced this pull request Oct 3, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
@smithfarm
Copy link
Contributor Author

@dachary 3 remaining commits moved to #5790

@smithfarm smithfarm closed this Oct 3, 2015
@smithfarm smithfarm deleted the wip-12925-hammer branch October 3, 2015 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants