autobuild v6.0-30
Resolves: bz#1775564 bz#1794153 Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
This commit is contained in:
Rinku Kothiya
parent
34a7dc81cf
commit
4fa5ab5077
@ -0,0 +1,38 @@
|
||||
From 8074906ace5fbd71b5d24cc3da5571ebdebed859 Mon Sep 17 00:00:00 2001
|
||||
From: Rinku Kothiya <rkothiya@redhat.com>
|
||||
Date: Thu, 2 Jan 2020 11:27:47 +0000
|
||||
Subject: [PATCH 352/353] spec: fixed missing dependencies for
|
||||
glusterfs-cloudsync-plugins
|
||||
|
||||
RPMDiff raises a warning, subpackage glusterfs-cloudsync-plugins
|
||||
on x86_64 consumes library libglusterfs.so.0()(64bit) from
|
||||
subpackage glusterfs-libs but does not have explicit package
|
||||
version requirement, which is fixed using this patch.
|
||||
|
||||
Label: DOWNSTREAM ONLY
|
||||
|
||||
BUG: 1775564
|
||||
|
||||
Change-Id: I05ea46ac2c92090f01c07dfbd6e0d66498f1c586
|
||||
Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
|
||||
Reviewed-on: https://code.engineering.redhat.com/gerrit/188619
|
||||
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||||
---
|
||||
glusterfs.spec.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
||||
index 671ee27..e95e539 100644
|
||||
--- a/glusterfs.spec.in
|
||||
+++ b/glusterfs.spec.in
|
||||
@@ -374,6 +374,7 @@ This package provides the GlusterFS CLI application and its man page
|
||||
%package cloudsync-plugins
|
||||
Summary: Cloudsync Plugins
|
||||
BuildRequires: libcurl-devel
|
||||
+Requires: glusterfs-libs = %{version}-%{release}
|
||||
|
||||
%description cloudsync-plugins
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
From 37e2d76579abf38031d1cd9769da798fa04b183a Mon Sep 17 00:00:00 2001
|
||||
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
|
||||
Date: Wed, 22 Jan 2020 14:14:33 -0500
|
||||
Subject: [PATCH 353/353] build: glusterfs-ganesha pkg requires
|
||||
python3-policycoreutils on rhel8
|
||||
|
||||
glusterfs-ganesha pkg requires policycoreutils-python-utils on rhel8,
|
||||
not policycoreutils-python
|
||||
|
||||
also requires nfs-ganesha-selinux on rhel-8 (optional on rhel-7)
|
||||
|
||||
Label: DOWNSTREAM ONLY
|
||||
|
||||
Change-Id: Ia97b4dabdc098fb76e3f60e8b48ea4191e677136
|
||||
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
||||
BUG: 1794153
|
||||
Reviewed-on: https://code.engineering.redhat.com/gerrit/190130
|
||||
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||||
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||||
---
|
||||
glusterfs.spec.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
||||
index e95e539..7c8a751 100644
|
||||
--- a/glusterfs.spec.in
|
||||
+++ b/glusterfs.spec.in
|
||||
@@ -462,6 +462,7 @@ Summary: NFS-Ganesha configuration
|
||||
Group: Applications/File
|
||||
|
||||
Requires: %{name}-server%{?_isa} = %{version}-%{release}
|
||||
+Requires: nfs-ganesha-selinux >= 2.7.3
|
||||
Requires: nfs-ganesha-gluster >= 2.7.3
|
||||
Requires: pcs, dbus
|
||||
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
||||
@@ -475,7 +476,7 @@ Requires: net-tools
|
||||
%endif
|
||||
|
||||
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
|
||||
-%if ( 0%{?rhel} )
|
||||
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
|
||||
Requires: selinux-policy >= 3.13.1-160
|
||||
Requires(post): policycoreutils-python
|
||||
Requires(postun): policycoreutils-python
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -231,7 +231,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
|
||||
%else
|
||||
Name: glusterfs
|
||||
Version: 6.0
|
||||
Release: 29%{?dist}
|
||||
Release: 30%{?dist}
|
||||
ExcludeArch: i686
|
||||
%endif
|
||||
License: GPLv2 or LGPLv3+
|
||||
@ -660,6 +660,8 @@ Patch0348: 0348-glusterfind-Fix-py2-py3-issues.patch
|
||||
Patch0349: 0349-glusterfind-python3-compatibility.patch
|
||||
Patch0350: 0350-tools-glusterfind-Remove-an-extra-argument.patch
|
||||
Patch0351: 0351-server-Mount-fails-after-reboot-1-3-gluster-nodes.patch
|
||||
Patch0352: 0352-spec-fixed-missing-dependencies-for-glusterfs-clouds.patch
|
||||
Patch0353: 0353-build-glusterfs-ganesha-pkg-requires-python3-policyc.patch
|
||||
|
||||
%description
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
@ -727,6 +729,7 @@ This package provides the GlusterFS CLI application and its man page
|
||||
%package cloudsync-plugins
|
||||
Summary: Cloudsync Plugins
|
||||
BuildRequires: libcurl-devel
|
||||
Requires: glusterfs-libs = %{version}-%{release}
|
||||
|
||||
%description cloudsync-plugins
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
@ -814,6 +817,7 @@ Summary: NFS-Ganesha configuration
|
||||
Group: Applications/File
|
||||
|
||||
Requires: %{name}-server%{?_isa} = %{version}-%{release}
|
||||
Requires: nfs-ganesha-selinux >= 2.7.3
|
||||
Requires: nfs-ganesha-gluster >= 2.7.3
|
||||
Requires: pcs, dbus
|
||||
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
||||
@ -827,7 +831,7 @@ Requires: net-tools
|
||||
%endif
|
||||
|
||||
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
|
||||
%if ( 0%{?rhel} )
|
||||
%if ( 0%{?rhel} && 0%{?rhel} < 8 )
|
||||
Requires: selinux-policy >= 3.13.1-160
|
||||
Requires(post): policycoreutils-python
|
||||
Requires(postun): policycoreutils-python
|
||||
@ -2387,6 +2391,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Feb 01 2020 Rinku Kothiya <rkothiya@redhat.com> - 6.0-30
|
||||
- fixes bugs bz#1775564 bz#1794153
|
||||
|
||||
* Thu Jan 23 2020 Rinku Kothiya <rkothiya@redhat.com> - 6.0-29
|
||||
- fixes bugs bz#1793035
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user