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

2 fixes for ansible.spec #4850

Closed
wants to merge 1 commit into from
Closed

2 fixes for ansible.spec #4850

wants to merge 1 commit into from

Conversation

dermute
Copy link
Contributor

@dermute dermute commented Nov 8, 2013

Fix 1: SLES build:

  • python_sitelib just like with RHEL
  • BuildRequires: python-devel instead of python2-devel
  • Requires: python-PyYAML instead of PyYAML

Fix 2: remove refs to absent man pages (man3):

  • cp in %install
  • %doc in %files

@dirtyharrycallahan
Copy link
Contributor

There is a previous pull request to "fix" the SuSE rpm build.

@mpdehaan
Copy link
Contributor

Might be useful to link the ticket number :)

@dirtyharrycallahan
Copy link
Contributor

The earlier pull request is #4689
I quoted "fix" because not all of the RPMs are available from SuSE for all versions or at least I could not find them in the repos my other administrators mirrors and transfers across our airgap. I ended up pulling the tar balls then using setup.py to build the rpms. Since I did not rename the rpms created by setup.py I override them.

@jctanner
Copy link
Contributor

jctanner commented Dec 2, 2013

@dermute Please split the second fix out into a new pull request.

@l1k
Copy link
Contributor

l1k commented Dec 2, 2013

Just my 2 cents on this patch:

As to "#2: remove refs to absent man pages": @mpdehaan originally uploaded an incomplete tarball to PyPI for release 1.3.4 (see issue #4804) which didn't contain the man3 manpages, @dermute probably based this patch on that incomplete tarball. That portion of the patch is therefore no longer necessary.

As to "#1: fix for SLES build": The clause "BuildArch: noarch" only works for openSUSE versions later than 11.1 and must therefore be encapuslated in an appropriate %if clause ("%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}"). This patch will therefore not work on openSUSE 11.1 and earlier. You may want to consider my pull request #5042 which doesn't have that deficiency. That pull request also includes the appropriate %fdupes stuff which is required for the package to be accepted by rpmlint on build.opensuse.org.

Also, please consider cherry-picking commit 2f25330 from pull request #5042 which contains fixes to ansible.spec that are unrelated to SUSE and thus of general use. Thanks.

@jctanner
Copy link
Contributor

jctanner commented Dec 4, 2013

@l1k 2f25330 has been partially committed in cdbce4a

@jctanner
Copy link
Contributor

jctanner commented Dec 4, 2013

@dermute as of 4422219 a lot your fixes are merged. Could you validate against your suse systems and report and bugs or make a new PR with fixes please?

@jctanner jctanner closed this Dec 4, 2013
@l1k
Copy link
Contributor

l1k commented Dec 13, 2013

@jctanner I've reviewed and tested the changes you've made and issued pull request #5281 to correct a few remaining errors. Thanks.

jimi-c pushed a commit that referenced this pull request Dec 6, 2016
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 5, 2018
@ansible ansible locked and limited conversation to collaborators Apr 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug This issue/PR relates to a bug. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants