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

Fixes #9001: Made webapp's spec file build on SLES12 #1043

Closed

Conversation

armeniaca
Copy link
Contributor

Apparently SLES12 SP1+ has no more %{sles_release} as macro,
only %{suse_release}, which however is defined also on SLES11
systems.

@peckpeck
Copy link
Member

%{?sles_version} is in other packages too, you should patch those specfiles too.
A quick grep gives me
./rudder-webapp/SPECS/rudder-webapp.spec
./ncf-api-virtualenv/SPECS/ncf-api-virtualenv.spec
./rudder-agent/SPECS/rudder-agent.spec
./rudder-reports/SPECS/rudder-reports.spec
./rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec
./rudder-server-relay/SPECS/rudder-server-relay.spec
./rudder-jetty/SPECS/rudder-jetty.spec
./rudder-inventory-endpoint/SPECS/rudder-inventory-endpoint.spec

@armeniaca
Copy link
Contributor Author

modified those as well

@@ -90,6 +90,10 @@ BuildRequires: openssl-devel
BuildRequires: libopenssl-devel
%endif

%if 0%{?suse_version} && 0%{?suse_version} == 1315
Copy link
Member

Choose a reason for hiding this comment

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

I don't understand the meaning of 1315, can you add a comment ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See at: https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto

SLE 12   %if 0%{?suse_version} == 1315  could also be Leap 42.1*

Copy link
Member

Choose a reason for hiding this comment

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

Could you add it as a comment so that we don't forget it later ?
Thanks

Apparently SLES12 SP1+ has no more %{sles_release} as macro,
only %{suse_release}, which however is defined also on SLES11
systems.
@peckpeck
Copy link
Member

Sorry, this PR is not mergeable anymore.
Could you rebase it ?
Thanks

@fanf
Copy link
Member

fanf commented Sep 21, 2016

This PR must be rebased, but it must be targetted to 3.1. @peckpeck, could you do that please?

@peckpeck
Copy link
Member

PR replaced by #1080

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants