Merge pull request #12969 from stevekuznetsov/skuznets/specfile-updates

Merged by openshift-bot

Author: OpenShift Bot

origin.spec

@@ -29,18 +29,17 @@
 %global os_git_vars OS_GIT_VERSION='' OS_GIT_COMMIT='' OS_GIT_MAJOR='' OS_GIT_MINOR='' OS_GIT_TREE_STATE=''
 }
 
-%{!?make_redistributable:
 %if 0%{?fedora} || 0%{?epel}
-%global make_redistributable 0
+%global need_redistributable_set 0
 %else
 # Due to library availability, redistributable builds only work on x86_64
 %ifarch x86_64
-%global make_redistributable 1
+%global need_redistributable_set 1
 %else
-%global make_redistributable 0
+%global need_redistributable_set 0
 %endif
 %endif
-}
+%{!?make_redistributable: %global make_redistributable %{need_redistributable_set}}
 
 %if "%{dist}" == ".el7aos"
 %global package_name atomic-openshift