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 - add support for EL7 builds - avoid to require both java and java-1.7.0-openjdk since java is already provided by java-1.7.0-openjdk Change-Id: Ia3bf3df726a5092637e2e0b8e2dd95625f7f89da Bug-Url: https://bugzilla.redhat.com/1159293 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M ovirt-engine-reports.spec.in 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/13/34913/1 diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index a78f797..54bdac8 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -10,9 +10,15 @@ %endif %if 0%{?rhel} +%if 0%{?rhel} >= 7 +%global java_devel java-devel >= 1.7.0 +%global ovirt_install_systemd 1 +%global ovirt_install_systemv 0 +%else %global java_devel java7-devel %global ovirt_install_systemd 0 %global ovirt_install_systemv 1 +%endif %global jboss ovirt-engine-jboss-as >= 7.1.1 %endif @@ -89,7 +95,6 @@ Requires: %{name}-setup >= %{version}-%{release} Requires: jasperreports-server%{reports_jasper_suffix} < 5.6.0 Requires: jasperreports-server%{reports_jasper_suffix} >= 5.5.0-7 -Requires: java Requires: java-1.7.0-openjdk >= 1:1.7.0.9-2.3.3.2 Requires: jpackage-utils Requires: logrotate -- To view, visit http://gerrit.ovirt.org/34913 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3bf3df726a5092637e2e0b8e2dd95625f7f89da Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
