From f4c1a49d1cd5a2e2605d87c81375f17b2da04e0a Mon Sep 17 00:00:00 2001 From: Julio Gonzalez Gil Date: Mon, 6 Jun 2016 18:03:08 +0200 Subject: [PATCH] Update to s3fs-fuse 1.80 --- README.md | 43 +++++++++++++++++++++++++++---------------- SPECS/s3fs-fuse.spec | 8 +++++--- s3fs-build-rpm | 2 +- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index b6688cc..d0826e5 100644 --- a/README.md +++ b/README.md @@ -7,24 +7,35 @@ Based off the [spec file](http://kad.fedorapeople.org/packages/s3fs/s3fs.spec) c Includes scripts to create RPMs for fuse-2.8.5 if needed. -Tested on x64 CentOS 6.4 and Amazon Linux 2014.03 +Tested on x64 CentOS 6.7 and 7.1 -Requirements ------------- +Build Requirements +------------------ + +All cases: -* Kernel-devel packages (or kernel source) installed that is the SAME version of your running kernel * automake -* LibXML2-devel packages -* CURL-devel packages (or compile curl from sources at: curl.haxx.se/ use 7.15.X) -* GCC, GCC-C++ -* pkgconfig -* FUSE (>= 2.8.4) -* FUSE Kernel module installed and running (RHEL 4.x/CentOS 4.x users - read below) -* OpenSSL-devel (0.9.8) -* MAKEDEV -* Git -* rpmbuild +* make +* git +* wget +* 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) +* gcc-c++ +* libcurl-devel +* libxml2-devel +* openssl-devel Building fresh RPMs @@ -41,7 +52,7 @@ 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, 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). +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. @@ -63,4 +74,4 @@ Build the RPMs: And install: - rpm -Uvh RPMS/$HOSTTYPE/s3fs-fuse-1.79-1.*.$HOSTTYPE.rpm + rpm -Uvh RPMS/$HOSTTYPE/s3fs-fuse-1.80-1.*.$HOSTTYPE.rpm diff --git a/SPECS/s3fs-fuse.spec b/SPECS/s3fs-fuse.spec index 474a13e..d5e558c 100644 --- a/SPECS/s3fs-fuse.spec +++ b/SPECS/s3fs-fuse.spec @@ -1,5 +1,5 @@ Name: s3fs-fuse -Version: 1.79 +Version: 1.80 Release: 1%{?dist} Summary: FUSE-based file system backed by Amazon S3 Group: System Environment/Base @@ -40,7 +40,6 @@ rsync backup to s3. ./autogen.sh %configure make %{?_smp_mflags} -sed -i 's/\r//' README %install @@ -51,11 +50,14 @@ cp -p %{SOURCE1} passwd-s3fs %files %{_bindir}/s3fs %{_mandir}/man1/s3fs.1* -%doc AUTHORS README passwd-s3fs +%doc AUTHORS README.md ChangeLog COPYING passwd-s3fs %changelog +* Thu Jul 30 2015 Julio Gonzalez Gil - 1.80-1 +- Initial build of 1.80 from https://github.com/s3fs-fuse/s3fs-fuse + * Thu Jul 30 2015 Julio Gonzalez Gil - 1.79-1 - Initial build of 1.78 from https://github.com/s3fs-fuse/s3fs-fuse diff --git a/s3fs-build-rpm b/s3fs-build-rpm index f2916ca..61aec8d 100755 --- a/s3fs-build-rpm +++ b/s3fs-build-rpm @@ -1,5 +1,5 @@ #!/bin/bash -VERSION='1.79' +VERSION='1.80' if [ ! -f "./SOURCES/s3fs-fuse-${VERSION}.tar.gz" ]; then wget "https://github.com/s3fs-fuse/s3fs-fuse/archive/v${VERSION}.tar.gz" -O "./SOURCES/s3fs-fuse-${VERSION}.tar.gz" if [ $? -ne 0 ]; then