summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-01-08 16:43:15 +0100
committerRaghavendra Bhat <raghavendra@redhat.com>2016-01-26 14:35:30 -0800
commitb73e870ef587a9bae83fafb424d0dc3a972f5727 (patch)
treec96d0a149342fc1d2ab284037cb3169bb9977941
parentf5bfb0c25bde939dbbc585151dfc029ebc09b714 (diff)
rpm: glusterfs-server requires -api
The glusterfs-server package requires libgfapi.so for the glfs-heal binary and possibly other parts. Also adding %{?_isa} to requirements as described in the Fedora Packaging Guidelines for Explicit Requires at https://fedoraproject.org/wiki/Packaging:Guidelines#Explicit_Requires This is a backport of: > BUG: 1296992 > Change-Id: I96c62876b776d04a7f5d1b1dc34c02302b6ffbe6 > Reviewed-on: http://review.gluster.org/13200 > Signed-off-by: Niels de Vos <ndevos@redhat.com> BUG: 1296931 Change-Id: I96c62876b776d04a7f5d1b1dc34c02302b6ffbe6 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/13201 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
-rw-r--r--glusterfs.spec.in46
1 files changed, 25 insertions, 21 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 133c902cefa..93900add832 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -188,7 +188,7 @@ Requires(preun): /sbin/chkconfig
Requires(postun): /sbin/service
%endif
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bison flex
BuildRequires: gcc make automake libtool
BuildRequires: ncurses-devel readline-devel
@@ -232,7 +232,7 @@ both GlusterFS server and client framework.
%package api
Summary: Clustered file-system api library
Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
# we provide the Python package/namespace 'gluster'
Provides: python-gluster = %{version}-%{release}
@@ -250,8 +250,8 @@ This package provides the glusterfs libgfapi library.
%package api-devel
Summary: Development Libraries
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description api-devel
GlusterFS is a distributed file-system capable of scaling to several
@@ -267,7 +267,7 @@ This package provides the api include files.
%package cli
Summary: GlusterFS CLI
Group: Applications/File
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description cli
GlusterFS is a distributed file-system capable of scaling to several
@@ -283,9 +283,9 @@ This package provides the GlusterFS CLI application and its man page
%package devel
Summary: Development Libraries
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
# Needed for the Glupy examples to work
-Requires: %{name}-extra-xlators = %{version}-%{release}
+Requires: %{name}-extra-xlators%{?_isa} = %{version}-%{release}
%description devel
GlusterFS is a distributed file-system capable of scaling to several
@@ -302,7 +302,7 @@ This package provides the development libraries and include files.
Summary: Extra Gluster filesystem Translators
Group: Applications/File
# We need -api rpm for its __init__.py in Python site-packages area
-Requires: %{name}-api = %{version}-%{release}
+Requires: %{name}-api%{?_isa} = %{version}-%{release}
Requires: python python-ctypes
%description extra-xlators
@@ -322,7 +322,7 @@ Summary: Fuse client
Group: Applications/File
BuildRequires: fuse-devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: attr
Obsoletes: %{name}-client < %{version}-%{release}
@@ -343,8 +343,8 @@ This package provides support to FUSE based clients.
%package geo-replication
Summary: GlusterFS Geo-replication
Group: Applications/File
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
Requires: python python-ctypes
%description geo-replication
@@ -405,9 +405,9 @@ This package provides support to ib-verbs library.
%package regression-tests
Summary: Development Tools
Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-fuse = %{version}-%{release}
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-fuse%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
## thin provisioning support
Requires: lvm2 >= 2.02.89
Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng
@@ -433,7 +433,7 @@ Group: System Environment/Base
Group: Productivity/Clustering/HA
%endif
# for glusterd
-Requires: glusterfs-server
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
# depending on the distribution, we need pacemaker or resource-agents
Requires: %{_prefix}/lib/ocf/resource.d
@@ -454,10 +454,11 @@ like Pacemaker.
%package server
Summary: Clustered file-system server
Group: System Environment/Daemons
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-cli = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-fuse = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-cli%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-fuse%{?_isa} = %{version}-%{release}
+Requires: %{name}-api%{?_isa} = %{version}-%{release}
# psmisc for killall, lvm2 for snapshot, and nfs-utils and
# rpcbind/portmap for gnfs server
Requires: psmisc
@@ -1038,8 +1039,8 @@ fi
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%changelog
-* Thu Mar 26 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
-- attr dependency (#1184626)
+* Fri Jan 08 2016 Niels de Vos <ndevos@redhat.com>
+- glusterfs-server depends on -api (#1296931)
* Thu Sep 25 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
- better logic in %%post server, (#1113543, reopened)
@@ -1077,6 +1078,9 @@ fi
* Wed Apr 02 2014 Arumugam Balamurugan <barumuga@redhat.com>
- add version/release dynamically (#1074919)
+* Thu Mar 26 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
+- attr dependency (#1184626)
+
* Wed Mar 26 2014 Poornima G <pgurusid@redhat.com>
- Include the hook scripts of add-brick, volume start, stop and set