rpms/glusterfs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

autobuild v6.0-44

Browse Source 
Resolves: bz#1460657
Signed-off-by: Deepshikha Khandelwal <dkhandel@redhat.com>
This commit is contained in:
Deepshikha Khandelwal 2020-09-03 16:03:04 +00:00
parent 2f5ee7359b
commit 4b366a2bd0
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0468-build-Update-the-glusterfs-selinux-version.patch Normal file
View File

@ -0,0 +1,36 @@
From 4b72f5e7704d480bac869f7a32ac891898bb994f Mon Sep 17 00:00:00 2001
From: Rinku Kothiya <rkothiya@redhat.com>
Date: Thu, 3 Sep 2020 14:56:27 +0000
Subject: [PATCH 468/468] build: Update the glusterfs-selinux version
Updated the glusterfs-selinux version according to
the downstream official version.
Label: DOWNSTREAM ONLY
BUG: 1460657
Change-Id: I7b8bbf53f71f6f56103042950d8910f0cb63a685
Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/210685
Tested-by: RHGS Build Bot <nigelb@redhat.com>
---
glusterfs.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index ed6bdf3..30d7162 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -651,7 +651,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-cli%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%if ( 0%{?fedora} && 0%{?fedora} >= 30 || ( 0%{?rhel} && 0%{?rhel} >= 8 ) )
-Requires: glusterfs-selinux >= 0.1.0-2
+Requires: glusterfs-selinux >= 1.0-1
%endif
# some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse
Requires: %{name}-fuse%{?_isa} = %{version}-%{release}
--
1.8.3.1

8
glusterfs.spec
View File

@ -237,7 +237,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: glusterfs
Version: 6.0
Release: 43%{?dist}
Release: 44%{?dist}
ExcludeArch: i686
%endif
License: GPLv2 or LGPLv3+
@ -782,6 +782,7 @@ Patch0464: 0464-storage-posix-Remove-nr_files-usage.patch
Patch0465: 0465-posix-Implement-a-janitor-thread-to-close-fd.patch
Patch0466: 0466-cluster-ec-Change-stale-index-handling.patch
Patch0467: 0467-build-Added-dependency-for-glusterfs-selinux.patch
Patch0468: 0468-build-Update-the-glusterfs-selinux-version.patch
%description
GlusterFS is a distributed file-system capable of scaling to several
@ -1120,7 +1121,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-cli%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%if ( 0%{?fedora} && 0%{?fedora} >= 30 || ( 0%{?rhel} && 0%{?rhel} >= 8 ) )
Requires: glusterfs-selinux >= 0.1.0-2
Requires: glusterfs-selinux >= 1.0-1
%endif
# some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse
Requires: %{name}-fuse%{?_isa} = %{version}-%{release}
@ -2525,6 +2526,9 @@ fi
%endif
%changelog
* Thu Sep 03 2020 Deepshikha Khandelwal <dkhandel@redhat.com> - 6.0-44
- fixes bugs bz#1460657
* Thu Sep 03 2020 Deepshikha Khandelwal <dkhandel@redhat.com> - 6.0-43
- fixes bugs bz#1460657