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: I1672e50c4977b4fb1ad97da9e661d5794b11d1e9 Bug-Url: https://bugzilla.redhat.com/1159293 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/20/34920/1 diff --git a/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in b/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in index 1a3f335..2e31e12 100644 --- a/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in +++ b/ovirt-engine-sdk-java/ovirt-engine-sdk-java.spec.in @@ -11,11 +11,19 @@ %endif %if 0%{?rhel} +%if 0%{?rhel} >= 7 +%global install_poms 1 +%global require_maven 1 +%global require_java_dep 1 +%global mvn mvn-rpmbuild +%global mvnout target +%else %global install_poms 0 %global require_maven 0 %global require_java_dep 0 %global mvn mvn %global mvnout target +%endif %endif Name: ovirt-engine-sdk-java @@ -33,7 +41,11 @@ BuildRequires: java-devel %endif %if 0%{?rhel} +%if 0%{?rhel} >= 7 +BuildRequires: java-devel +%else BuildRequires: java7-devel +%endif %endif BuildRequires: jpackage-utils @@ -208,7 +220,7 @@ - to VersionCaps added a list of supported payload-encodings - to Step added externalType - to NIC added vnicProfile and bootProtocol -- to CPU added architecture +- to CPU added architecture - to VnicProfilePermission added delete() method - to Disk added readOnly - to VMs.add() added [vm.cpu.architecture], [action.vm.initialization.cloud_init.*] arguments @@ -283,7 +295,7 @@ - [@param template.console.enabled: boolean] #878459 - to vm added: - [@param vm.console.enabled: boolean] #878459 -- to Cluster added: +- to Cluster added: *[@param cluster.comment: string] *[@param cluster.ballooning_enabled: boolean] *[@param cluster.tunnel_migration: boolean] -- To view, visit http://gerrit.ovirt.org/34920 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1672e50c4977b4fb1ad97da9e661d5794b11d1e9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java Gerrit-Branch: sdk_3.5 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
