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.

Sign up for GitHub

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

Add conifer external #8780

Merged
merged 3 commits into from
Oct 25, 2023
Merged

Add conifer external #8780

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ec9d12
Add conifer external
thesps Oct 23, 2023
60cac4d
Add json requirement
thesps Oct 23, 2023
6ad2c6c
Address comments: change include and add use JSON to xml. Add conifer…
thesps Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions conifer.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
### RPM external conifer 1.2
## NOCOMPILER

Source: https://github.com/thesps/%{n}/archive/v%{realversion}.tar.gz
Requires: json

%prep
%setup -n %{n}-%{realversion}

%build

%install
mkdir -p %{i}/include/
cp conifer/backends/cpp/include/conifer.h %{i}/include/

%post

7 changes: 7 additions & 0 deletions scram-tools.file/tools/conifer/conifer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<tool name="conifer" version="@TOOL_VERSION@">
<client>
<environment name="CONIFER_BASE" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$CONIFER_BASE/conifer/backends/cpp/include"/>
Copy link
Contributor

@smuzaffar smuzaffar Oct 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

please change $CONIFER_BASE/conifer/backends/cpp/include to $CONIFER_BASE/include ( as you copied the header in %{i}/include ).

Also please add <use name="json"/> after </client>

</client>
</tool>