Fixes #9405: AIX doesn't build on 4.0 #1113
Merged
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
peckpeck
commented
Oct 18, 2016
| @@ -480,7 +478,6 @@ rm -f %{_builddir}/file.list.%{name} | |||
| %config(noreplace) /etc/default/rudder-agent | |||
| %endif | |||
| %config /etc/bash_completion.d/rudder | |||
| %config(noreplace) /opt/rudder/etc/uuid.hive | |||
peckpeck
commented
Oct 18, 2016
| @@ -454,8 +454,6 @@ rm -f %{_builddir}/file.list.%{name} | |||
| %files -f %{_builddir}/file.list.%{name} | |||
| %defattr(-, root, root, 0755) | |||
|
|
|||
| %{bindir}/rudder | |||
There was a problem hiding this comment.
Already in the file.list from find
peckpeck
commented
Oct 18, 2016
| @@ -296,7 +296,7 @@ cd %{_sourcedir} | |||
| make install DESTDIR=%{buildroot} USE_SYSTEM_OPENSSL=%{use_system_openssl} USE_SYSTEM_LMDB=%{use_system_lmdb} USE_SYSTEM_PCRE=%{use_system_pcre} NO_INIT=%{no_init} NO_CRON=%{no_cron} NO_LD=%{no_ld} NO_PROFILE=%{no_profile} USE_SYSTEM_FUSION=%{use_system_fusion} USE_SYSTEM_PERL=%{use_system_perl} NO_LDSO=%{no_ldso} | |||
|
|
|||
| # Build a list of files to include in this package for use in the %files section below | |||
| find %{buildroot} -type f -o -type l | sed "s,%{buildroot},," | sed "s,\.py$,\.py*," | grep -v "%{rudderdir}/etc/uuid.hive" | grep -v "%{ruddervardir}/cfengine-community/ppkeys" > %{_builddir}/file.list.%{name} | |||
| find %{buildroot} -type f -o -type l | sed "s,%{buildroot},," | sed "s,\.py$,\.py*," | grep -v "%{rudderdir}/etc/uuid.hive" | grep -v "%{rudderdir}/etc/bash_completion.d" | grep -v "%{ruddervardir}/cfengine-community/ppkeys" > %{_builddir}/file.list.%{name} | |||
There was a problem hiding this comment.
Must be a config file -> manual
|
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/9405