Skip to content

Commit ab709c2

Browse files
Backported redistributable logic to Origin specfile
This back-ports downstream commit 25fa795. Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent 05377d4 commit ab709c2

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

origin.spec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,17 @@
2929
%global os_git_vars OS_GIT_VERSION='' OS_GIT_COMMIT='' OS_GIT_MAJOR='' OS_GIT_MINOR='' OS_GIT_TREE_STATE=''
3030
}
3131

32-
%{!?make_redistributable:
3332
%if 0%{?fedora} || 0%{?epel}
34-
%global make_redistributable 0
33+
%global need_redistributable_set 0
3534
%else
3635
# Due to library availability, redistributable builds only work on x86_64
3736
%ifarch x86_64
38-
%global make_redistributable 1
37+
%global need_redistributable_set 1
3938
%else
40-
%global make_redistributable 0
39+
%global need_redistributable_set 0
4140
%endif
4241
%endif
43-
}
42+
%{!?make_redistributable: %global make_redistributable %{need_redistributable_set}}
4443

4544
%if "%{dist}" == ".el7aos"
4645
%global package_name atomic-openshift

0 commit comments

Comments
 (0)