From 4c5eb05e6ad8171f4bab30015196e7eccc4a751f Mon Sep 17 00:00:00 2001
From: Julio Gonzalez Gil <git@juliogonzalez.es>
Date: Mon, 10 Aug 2020 19:44:00 +0200
Subject: [PATCH] Remove CentOS6, as s3fs-fuse v1.87 does not support it

---
 README.md            | 57 ++++++++++----------------------------------
 SPECS/s3fs-fuse.spec |  3 ---
 ci                   |  2 +-
 3 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index b6d7ea3..4eee999 100644
--- a/README.md
+++ b/README.md
@@ -6,26 +6,27 @@ s3fs-fuse
     <th colspan="2">Statuses</th>
   </tr>
   <tr>
-    <td>Tests and RPM Builds<br />(CentOS6, CentOS7, Amazon Linux 2017.03)</td>
+    <td>Tests and RPM Builds<br />(CentOS7, Amazon Linux 2017.03)</td>
     <td>
       <a href="https://jenkins.juliogonzalez.es/job/s3fs-fuse-rpm-build/" target="_blank"><img src="https://jenkins.juliogonzalez.es/job/s3fs-fuse-rpm-build/badge/icon" alt="Test status" valign="middle" /></a>
     </td>
   </tr>
   <tr>
-    <td>COPR RPM Builds<br />(Fedora 27/28/29/rawhide, EPEL7)</td>
+    <td>COPR RPM Builds<br />(Fedora and EPEL7)</td>
     <td>
-      <a href="https://copr.fedorainfracloud.org/coprs/juliogonzalez/s3fs-fuse/monitor/" target="_blanK"><img src="https://copr.fedorainfracloud.org/coprs/juliogonzalez/s3fs-fuse/package/s3fs-fuse/status_image/last_build.png" alt="RPM Build status" valign="middle" /></a>
+      <a href="https://copr.fedorainfracloud.org/coprs/juliogonzalez/s3fs-fuse/monitor/" target="_blank"><img src="https://copr.fedorainfracloud.org/coprs/juliogonzalez/s3fs-fuse/package/s3fs-fuse/status_image/last_build.png" alt="RPM Build status" valign="middle" /></a>
     </td>
   </tr>
 </table>
 
-CentOS/RH/Amazon RPMs for S3FS-Fuse <https://github.com/s3fs-fuse/s3fs-fuse>
+CentOS/RH/Amazon RPMs for s3fs <https://github.com/s3fs-fuse/s3fs-fuse>
 
 Based off the [spec file](http://kad.fedorapeople.org/packages/s3fs/s3fs.spec) created by [Jorge A Gallegos](http://kad.fedorapeople.org/), referenced at <https://bugzilla.redhat.com/show_bug.cgi?id=725292>, and upgraded by [Corey Gilmore](https://github.com/cfg), refered at <https://github.com/cfg/s3fs>
 
-Includes scripts to create RPMs for fuse-2.8.5 if needed.
 
-Tested on x64 CentOS 6, CentOS 7 and Amazon Linux 2017.03
+Tested on x64 CentOS 7 and Amazon Linux 2017.03
+
+**WARNING**: CentOS6/RHEL6 are **not** supported since s3fs v1.87 as discussed at https://github.com/s3fs-fuse/s3fs-fuse/issues/1354 If you still want to use s3fs, use [v1.86-2](https://github.com/juliogonzalez/s3fs-fuse-rpm/releases/tag/1.86-2)
 
 Source for Fedora and EPEL
 --------------------------
@@ -36,32 +37,18 @@ As of today, the SPEC in this repository is exactly the same that is then pushed
 Build Requirements
 ------------------
 
-All cases:
-
 * automake
-* make
-* git
 * curl
-* rpm-build
-
-fuse 2.85 (if you need to compile it):
-
-* kernel-devel packages (or kernel source) installed that is the SAME version of your running kernel
-* gcc
-* libselinux-devel
-* libtool
-* gettext-devel
-
-s3fs:
-
-* fuse-devel (>= 2.8.4, from your distribution, or from this repository)
+* make
+* fuse-devel (>= 2.8.4)
+* git (to clone this repository, not needed if you download a tarball from the [releases](https://github.com/juliogonzalez/s3fs-fuse-rpm/releases))
 * gcc-c++
 * libcurl-devel
 * libxml2-devel
+* make
 * openssl-devel
 * pkgconfig
-* epel-rpm-macros (only for CentOS/RHEL6, from the EPEL6 repository)
-
+* rpm-build
 
 Building fresh RPMs
 -------------------
@@ -72,24 +59,6 @@ Clone the repo:
     cd s3fs-fuse-rpm
 
 
-Build fuse-2.8.5 RPMs
----------------------
-
-**WARNING**: Because fuse developers migrated from SourceForge to GitHub and deleted all content from SourceForge, the script and the SPEC to build fuse will not work before commit **daf3c1f**. If you are trying to build an old s3fs version (1.79 or older), please build fuse using commit **daf3c1f** or newer.
-
-If you do not have fuse >= 2.8.4 available (which for example is the case for CentOS 6.x), then you may compile 2.8.5 using my fork of [fuse-2.8.5-99.vitki.01.el5.src.rpm](http://rpm.vitki.net/pub/centos/6/source/fuse-2.8.5-99.vitki.01.el5.src.rpm).
-
-Otherwise, you do not need this step, but install fuse-devel and fuse-libs for your system.
-
-Rebuild:
-
-    ./fuse-rpm
-
-And install
-
-    rpm -Uvh RPMS/$HOSTTYPE/fuse-devel-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm RPMS/$HOSTTYPE/fuse-libs-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm
-
-
 Build the s3fs-fuse RPMs
 ------------------------
 
@@ -99,4 +68,4 @@ Build the RPMs:
 
 And install:
 
-    rpm -Uvh RPMS/$HOSTTYPE/s3fs-fuse-1.84-2.*.$HOSTTYPE.rpm
+    rpm -Uvh RPMS/$HOSTTYPE/s3fs-fuse-1.87-1.*.$HOSTTYPE.rpm
diff --git a/SPECS/s3fs-fuse.spec b/SPECS/s3fs-fuse.spec
index b3973b3..fa8359e 100644
--- a/SPECS/s3fs-fuse.spec
+++ b/SPECS/s3fs-fuse.spec
@@ -12,9 +12,6 @@ URL:            https://github.com/s3fs-fuse/s3fs-fuse
 Source0:        https://github.com/s3fs-fuse/s3fs-fuse/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        passwd-s3fs
 
-# s3fs-fuse requires at least fuse 2.8.4, which is not available for
-# CentOS/RHEL6
-# See https://github.com/s3fs-fuse/s3fs-fuse/issues/42
 Requires:       fuse-libs >= 2.8.4
 # Fuse is required to be able to use mount command, /etc/fstab or mount via systemd
 Requires:       fuse >= 2.8.4
diff --git a/ci b/ci
index ce9d925..bb7ad60 100755
--- a/ci
+++ b/ci
@@ -6,7 +6,7 @@ LANG=en_EN
 SCRIPT=$(basename ${0})
 
 # Supported distributions
-SUPPORTEDDISTROS="centos6 centos7 amazon2017.03"
+SUPPORTEDDISTROS="centos7 amazon2017.03"
 
 # Allocate tty by default
 TTY='-t'