Final changes to comply with Fedora guidelines

README.md

@@ -38,6 +38,8 @@ s3fs:
 * libcurl-devel
 * libxml2-devel
 * openssl-devel
+* pkgconfig
+* epel-rpm-macros (only for CentOS/RHEL6, from the EPEL6 repository)
 
 
 Building fresh RPMs
@@ -64,7 +66,7 @@ Rebuild:
 
 And install
 
-    rpm -Uvh RPMS/$HOSTTYPE/fuse-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm RPMS/$HOSTTYPE/fuse-devel-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm RPMS/$HOSTTYPE/fuse-libs-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm
+    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

SPECS/s3fs-fuse.spec

@@ -1,66 +1,65 @@
 %global _hardened_build 1
-%global _release_simple 2
+%{!?make_build: %global make_build %{__make} %{?_smp_mflags}}
 
 Name:           s3fs-fuse
 Version:        1.84
 
-Release:        %{_release_simple}%{?dist}
+Release:        2%{?dist}
 Summary:        FUSE-based file system backed by Amazon S3
 
-License:        GPLv2
+License:        GPLv2+
 URL:            https://github.com/s3fs-fuse/s3fs-fuse
-Source0:        https://github.com/s3fs-fuse/s3fs-fuse/archive/v%{version}.tar.gz
-Source1:        https://github.com/juliogonzalez/s3fs-fuse-rpm/blob/%{version}-%{_release_simple}/SOURCES/passwd-s3fs
+Source0:        https://github.com/s3fs-fuse/s3fs-fuse/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1:        passwd-s3fs
 
-Requires:	fuse >= 2.8.4
+# 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
-Requires:	curl >= 7.0
-Requires:	libxml2 >= 2.6
-Requires:	openssl >= 0.9
-
-BuildRequires:  curl-devel, fuse-devel, libxml2-devel, openssl-devel
-BuildRequires:	automake, gcc-c++, make
+BuildRequires:  automake
+BuildRequires:  gcc-c++
+BuildRequires:  make
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(fuse) >= 2.8.4
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(openssl)
+# fuse-s3fs has a binary s3fs too
 Conflicts:      fuse-s3fs
-Obsoletes:	s3fs
 
 %description
 s3fs is a FUSE file system that allows you to mount an Amazon S3 bucket as a
 local file system. It stores files natively and transparently in S3 (i.e.,
 you can use other programs to access the same files). Maximum file size=64GB
 (limited by s3fs, not Amazon).
-.
+
 s3fs is stable and is being used in number of production environments, e.g.,
 rsync backup to s3.
 
-%global debug_package %{nil}
-
 %prep
-%setup -q
-
+%autosetup
+cp -p %{SOURCE1} passwd-s3fs
 
 %build
 ./autogen.sh
 %configure
-make %{?_smp_mflags}
-
+%make_build
 
 %install
-make install DESTDIR=%{buildroot}
-cp -p %{SOURCE1} passwd-s3fs
-
+%make_install
 
 %files
 %{_bindir}/s3fs
 %{_mandir}/man1/s3fs.1*
-%doc AUTHORS README.md ChangeLog COPYING passwd-s3fs
-
+%doc AUTHORS README.md ChangeLog passwd-s3fs
+%{!?_licensedir:%global license %doc}
+%license COPYING
 
 %changelog
 * Sat Sep 22 2018 Julio Gonzalez Gil <git@juliogonzalez.es> - 1.84-2
-- Build with PIE enabled, as it is required by Fedora
-- Remove Group tag, as required by Fedora
+- General cleanup to adapt to Fedora guidelines
+- Build with PIE enabled (required by Fedora)
 - Remove unneeded build requirement for mailcap
-- Fix URLs for s3fs-fuse sources
 
 * Sun Jul  8 2018 Julio Gonzalez Gil <git@juliogonzalez.es> - 1.84-1
 - Initial build of 1.84 from https://github.com/s3fs-fuse/s3fs-fuse

ci

@@ -118,8 +118,12 @@ docker container run -i ${TTY} --name "${CONTAINER_NAME}" -v ${PWD}:/tmp/s3fs-fu
 print_info "Cleaning up"
 docker_run "${CONTAINER_NAME}" "./clean"
 print_info "Installing required dependencies..."
-docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install automake make git rpm-build" # Common dependencies
+docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install automake make git rpm-build pkgconfig" # Common dependencies
 docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install gcc-c++ libcurl-devel libxml2-devel openssl-devel" # s3fs dependencies
+if [ "${DISTRO}" == "centos6" ]; then
+  docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install epel-release" # Install EPEL repository
+  docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install epel-rpm-macros" # Install epel-rpm-macros, required for macros not available by default
+fi
 docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install initscripts kernel mailcap openssl" # Other dependencies only needed at docker
 print_info "Configuring user ci..."
 docker_run "${CONTAINER_NAME}" "/usr/sbin/groupadd -g $(id -g) ci"
@@ -131,14 +135,15 @@ if [ ! -z ${BUILD_FUSE} ]; then
   print_info "Building fuse (required by ${DISTRO})..."
   docker_run "${CONTAINER_NAME}" "./fuse-rpm" "ci"
   print_info "Installing fuse..."
-  docker_run "${CONTAINER_NAME}" "/bin/rpm -i RPMS/$HOSTTYPE/fuse-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm RPMS/$HOSTTYPE/fuse-devel-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm RPMS/$HOSTTYPE/fuse-libs-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm"
+  docker_run "${CONTAINER_NAME}" "/bin/rpm -i RPMS/$HOSTTYPE/fuse-devel-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm RPMS/$HOSTTYPE/fuse-libs-2.8.5-99.vitki.03.*.$HOSTTYPE.rpm"
 else
   print_info "Installing fuse..."
-  docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install fuse fuse-devel" # fuse
+  docker_run "${CONTAINER_NAME}" "/usr/bin/yum -q -y install fuse-libs fuse-devel" # fuse
 fi
 print_info "Building s3fs-fuse package..."
 docker_run "${CONTAINER_NAME}" "./s3fs-build-rpm" "ci"
 print_info "Installing s3fs-fuse package..."
+docker_run "${CONTAINER_NAME}" "/bin/rpm -e fuse-devel"
 docker_run "${CONTAINER_NAME}" "/bin/rpm -i RPMS/$HOSTTYPE/s3fs-fuse-*.*.$HOSTTYPE.rpm"
 print_info "Removing container..."
 remove_container ${CONTAINER_NAME}

s3fs-build-rpm

@@ -1,17 +1,14 @@
 #!/bin/bash
-VERSION='1.84'
-SOURCE_URL=
-
 SPEC='SPECS/s3fs-fuse.spec'
 VERSION=$(sed -rn 's/Version:\s*(.*)/\1/p' ${SPEC})
-SOURCE_URL=$(sed -rn 's/Source0:\s*(.*)/\1/p' ${SPEC}|sed -e "s/%{version}/${VERSION}/")
+NAME=$(sed -rn 's/Name:\s*(.*)/\1/p' ${SPEC})
+SOURCE_URL=$(sed -rn 's/Source0:\s*(.*)/\1/p' ${SPEC}|sed -e "s/%{name}/${NAME}/g"|sed -e "s/%{version}/${VERSION}/g")
 TARBALL="./SOURCES/$(basename ${SOURCE_URL})"
-
 if [ ! -f "${TARBALL}" ]; then
   echo "### Downloading s3fs-fuse sources..."
   curl -L "${SOURCE_URL}" -o "${TARBALL}"
   if [ $? -ne 0 ]; then
-    echo "Could not download fuse-${VERSION}.tar.gz! Check log!"
+    echo "Could not download ${TARBALL}! Check log!"
     exit 1
   fi
 fi