Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: spec: add support for EL7 builds ......................................................................
packaging: spec: add support for EL7 builds Change-Id: Id6fcef7e48cc1f616b09b4c3cb42b9bb92a8259f Bug-Url: https://bugzilla.redhat.com/1159293 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-engine.spec.in 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/34750/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 540701b..1bcb9a6 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -43,12 +43,12 @@ %global EXTRA_BUILD_FLAGS %{?_ovirt_build_extra_flags:%{_ovirt_build_extra_flags}}%{?ovirt_build_extra_flags: %{ovirt_build_extra_flags}} %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 %global ovirt_install_systemd 1 %global ovirt_install_systemv 0 %global ovirt_install_poms 1 %global ovirt_require_maven 1 -%if %{fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 %global ovirt_provides_jboss 1 %global jboss ovirt-engine-jboss-as >= 7.1.1 %else @@ -57,7 +57,7 @@ %endif %endif -%if 0%{?rhel} +%if 0%{?rhel} == 6 %global ovirt_install_systemd 0 %global ovirt_install_systemv 1 %global ovirt_install_poms 0 @@ -181,10 +181,10 @@ BuildArch: noarch -%if 0%{?rhel} +%if 0%{?rhel} == 6 BuildRequires: java7-devel %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: java-devel >= 1.7.0 %endif -- To view, visit http://gerrit.ovirt.org/34750 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6fcef7e48cc1f616b09b4c3cb42b9bb92a8259f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
