Navigation Menu

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

Remove the superfluous build requirement of libsodium-devel #3735

Merged
merged 2 commits into from Nov 12, 2019

Conversation

viciious
Copy link
Contributor

The following lines in the .spec file ensure that the necessary packages are present on the system in case the rpm is being built with libsodium support enabled:

%bcond_with libsodium
%if %{with libsodium}
BuildRequires:  libsodium-devel
%define SODIUM yes
%else
%define SODIUM no
%endif
%{?_with_libsodium:BuildRequires: libsodium-devel}
%{?_with_libsodium:Requires: libsodium}

Unconditionally requiring libsodium-devel makes it impossible to build the spec file with default arguments if the aforementioned package is not installed. This merge request amends that.

@bluca
Copy link
Member

bluca commented Nov 12, 2019

Thanks for the PR - please add a commit with a relicense statement https://github.com/zeromq/libzmq/blob/master/RELICENSE/README.md

@viciious
Copy link
Contributor Author

Thanks for the PR - please add a commit with a relicense statement https://github.com/zeromq/libzmq/blob/master/RELICENSE/README.md

Done

@bluca bluca merged commit 97df2da into zeromq:master Nov 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants