Fixes #10469: Make SLES12 RPMs depend on java8 headless #1305
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amousset
reviewed
Mar 21, 2017
rudder-jetty/SPECS/rudder-jetty.spec
Outdated
| @@ -88,10 +88,13 @@ Requires: jre >= 1.8 | |||
| Requires: java-1.8.0-openjdk-headless | |||
| %endif | |||
|
|
|||
| %if 0%{?suse_version} && 0%{?suse_version} == 1315 && 0%{?sle_version} && 0%{?sle_version} >= 120100 | |||
There was a problem hiding this comment.
I think we can remove the "suse_version" checks.
There was a problem hiding this comment.
Apparently SLES12 has:
# rpm --eval '%{suse_version}'
1315
SLES11 has:
# rpm --eval '%{suse_version}'
1110
There was a problem hiding this comment.
But no sle_version:
SLE11
# rpm --eval '%{sle_version}'
%{sle_version}
SLES12
# rpm --eval '%{sle_version}'
120200
There was a problem hiding this comment.
It is consistent with what is documented there: https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
There was a problem hiding this comment.
Here we are targeting SLES12SP1+, so 0%{?sle_version} && 0%{?sle_version} >= 120100 should be ok.
|
Commit modified |
peckpeck
force-pushed
the
bug_10469/make_sles12_rpms_depend_on_java8_headless
branch
from
caf00c3
to
e186ba5
Compare
|
OK, merging this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/10469