Francesco Romani has uploaded a new change for review. Change subject: build: require only the same version, not release ......................................................................
build: require only the same version, not release The various vdsm subpackages where requiring version-release. The `release` value, however, depends on the build, hence it can get out of sync when building on different architectures (e.g. x86_64, ppc64), so we can end up depending on packaged which does not exists in the repository. We recently had the same issue on ioprocess (https://gerrit.ovirt.org/#/c/62464/1), so we are borrowing the same solution: we set dependencies only on versions, ignorning the release. Like ioprocess, Vdsm must be backward compatible within the same release, so nothing is lost from the safety side. Change-Id: Ibf5366b0d38471114ddd3ad82e1402ebd308338e Signed-off-by: Francesco Romani <from...@redhat.com> --- M vdsm.spec.in 1 file changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/62672/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 9f85c20..d3b6524 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -148,8 +148,8 @@ Requires: m2crypto Requires: libnl3 Requires: curl -Requires: %{name}-xmlrpc = %{version}-%{release} -Requires: %{name}-jsonrpc = %{version}-%{release} +Requires: %{name}-xmlrpc = %{version} +Requires: %{name}-jsonrpc = %{version} Requires: safelease >= 1.0-7 Requires: mom >= 0.5.3 Requires(pre): shadow-utils @@ -257,8 +257,8 @@ Requires: dosfstools Requires: genisoimage Requires: libselinux-python -Requires: %{name}-python = %{version}-%{release} -Requires: %{name}-hook-vmfex-dev = %{version}-%{release} +Requires: %{name}-python = %{version} +Requires: %{name}-hook-vmfex-dev = %{version} Requires: NetworkManager-config-server Requires(post): /usr/sbin/saslpasswd2 @@ -280,8 +280,8 @@ %package cli Summary: VDSM command line interface BuildArch: noarch -Requires: %{name}-python = %{version}-%{release} -Requires: %{name}-xmlrpc = %{version}-%{release} +Requires: %{name}-python = %{version} +Requires: %{name}-xmlrpc = %{version} %description cli Call VDSM commands from the command line. Used for testing and debugging. @@ -289,7 +289,7 @@ %package xmlrpc Summary: VDSM xmlrpc API BuildArch: noarch -Requires: %{name}-python = %{version}-%{release} +Requires: %{name}-python = %{version} %description xmlrpc @@ -306,9 +306,9 @@ %package jsonrpc Summary: VDSM API Server BuildArch: noarch -Requires: %{name}-python = %{version}-%{release} -Requires: %{name}-api = %{version}-%{release} -Requires: %{name}-yajsonrpc = %{version}-%{release} +Requires: %{name}-python = %{version} +Requires: %{name}-api = %{version} +Requires: %{name}-yajsonrpc = %{version} Obsoletes: %{name}-api < 4.16 %description jsonrpc @@ -324,7 +324,7 @@ %package python Summary: VDSM python libraries -Requires: %{name}-api = %{version}-%{release} +Requires: %{name}-api = %{version} BuildArch: noarch Requires: python-cpopen >= 1.4 Requires: m2crypto @@ -349,7 +349,7 @@ %package tests Summary: VDSM Test Suite BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: dracut Requires: python-nose @@ -375,7 +375,7 @@ %package hook-checkips Summary: Check connectivity from the host to designated IPs -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description hook-checkips VDSM hook used to check connectivity from the host network to designated IPs @@ -397,7 +397,7 @@ %package hook-ethtool-options Summary: Allow setting custom ethtool options for vdsm controlled nics BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description hook-ethtool-options VDSM hook used for applying custom network properties that define ethtool @@ -459,7 +459,7 @@ %package hook-extnet Summary: Force a vNIC to connect to a specific libvirt network BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description hook-extnet VDSM hook which allows to connect a vNIC to a libvirt network that is managed @@ -566,7 +566,7 @@ %package hook-ovs Summary: Open vSwitch support for VDSM BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: openvswitch >= 2.0.0 %description hook-ovs @@ -642,7 +642,7 @@ %package hook-vmfex-dev Summary: VM-FEX vNIC support for VDSM BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Conflicts: hook-vmfex %description hook-vmfex-dev @@ -668,7 +668,7 @@ %package hook-fcoe Summary: Hook to enable FCoE support BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: fcoe-utils %description hook-fcoe @@ -683,7 +683,7 @@ %package gluster Summary: Gluster Plugin for VDSM BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: glusterfs-server >= %{gluster_version} Requires: glusterfs-api >= %{gluster_version} Requires: glusterfs-geo-replication >= %{gluster_version} -- To view, visit https://gerrit.ovirt.org/62672 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf5366b0d38471114ddd3ad82e1402ebd308338e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <from...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
