diff --git a/.gitignore b/.gitignore index 38d5ced..f379a33 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ fuse-2.8.4.tar.gz /fuse-3.0.2.tar.gz /fuse-3.1.0.tar.gz /fuse-3.1.1.tar.gz +/fuse-3.2.1.tar.gz diff --git a/fuse-3.2.1-no-dev.patch b/fuse-3.2.1-no-dev.patch new file mode 100644 index 0000000..371fc24 --- /dev/null +++ b/fuse-3.2.1-no-dev.patch @@ -0,0 +1,19 @@ +diff -up libfuse-fuse-3.2.1/util/install_helper.sh.nodev libfuse-fuse-3.2.1/util/install_helper.sh +--- libfuse-fuse-3.2.1/util/install_helper.sh.nodev 2017-11-14 15:48:15.000000000 -0500 ++++ libfuse-fuse-3.2.1/util/install_helper.sh 2017-11-16 15:23:20.552413938 -0500 +@@ -11,14 +11,9 @@ bindir="$2" + udevrulesdir="$3" + prefix="${MESON_INSTALL_DESTDIR_PREFIX}" + +-chown root:root "${prefix}/${bindir}/fusermount3" ++# chown root:root "${prefix}/${bindir}/fusermount3" + chmod u+s "${prefix}/${bindir}/fusermount3" + +-if test ! -e "${DESTDIR}/dev/fuse"; then +- mkdir -p "${DESTDIR}/dev" +- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 +-fi +- + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + "${DESTDIR}/${udevrulesdir}/99-fuse3.rules" + diff --git a/fuse.spec b/fuse.spec index 3cac476..9d438d9 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,10 +1,10 @@ %global fuse2ver 2.9.7 %global fuse2sver 2 -%global fuse3ver 3.1.1 +%global fuse3ver 3.2.1 Name: fuse Version: %{fuse2ver} -Release: 9%{?dist} +Release: 10%{?dist} Summary: File System in Userspace (FUSE) v2 utilities License: GPL+ URL: http://fuse.sf.net @@ -18,11 +18,13 @@ Patch1: fuse-3.0.0-More-parentheses.patch Patch2: fuse-0001-More-parentheses.patch # https://bugzilla.redhat.com/show_bug.cgi?id=970768 Patch3: fuse-2.9.2-namespace-conflict-fix.patch +Patch4: fuse-3.2.1-no-dev.patch Requires: which Conflicts: filesystem < 3 BuildRequires: libselinux-devel BuildRequires: autoconf, automake, libtool, gettext-devel +BuildRequires: meson, ninja-build Requires: fuse-common = %{fuse3ver} %description @@ -103,10 +105,8 @@ Common files for FUSE v2 and FUSE v3. # fuse 3 pushd lib%{name}-%{name}-%{fuse3ver} -./makeconf.sh -#disable device creation during build/install -sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in %patch1 -p1 -b .add_parentheses +%patch4 -p1 -b .nodev popd # fuse 2 @@ -121,10 +121,14 @@ popd %build # fuse 3 pushd lib%{name}-%{name}-%{fuse3ver} +%meson +%meson_build +%if 0 # Can't pass --disable-static here, or else the utils don't build export MOUNT_FUSE_PATH="%{_sbindir}" CFLAGS="%{optflags} -D_GNU_SOURCE" %configure make %{?_smp_mflags} V=1 +%endif popd # fuse 2 @@ -138,7 +142,7 @@ popd %install # fuse 3 pushd lib%{name}-%{name}-%{fuse3ver} -make install DESTDIR=%{buildroot} +export MESON_INSTALL_DESTDIR_PREFIX=%{buildroot}/usr %meson_install popd find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' # change from 4755 to 0755 to allow stripping -- fixed later in files @@ -196,6 +200,7 @@ rm -f %{buildroot}%{_libdir}/udev/rules.d/99-fuse3.rules %license libfuse-fuse-%{fuse3ver}/COPYING %doc libfuse-fuse-%{fuse3ver}/AUTHORS libfuse-fuse-%{fuse3ver}/ChangeLog.rst libfuse-fuse-%{fuse3ver}/README.md %{_sbindir}/mount.fuse3 +/usr/lib/udev/rules.d/99-fuse3.rules %attr(4755,root,root) %{_bindir}/fusermount3 %files common @@ -226,6 +231,9 @@ rm -f %{buildroot}%{_libdir}/udev/rules.d/99-fuse3.rules %{_includedir}/fuse3/ %changelog +* Thu Nov 16 2017 Tom Callaway 2.9.7-10 +- update fuse3 to 3.2.1 + * Mon Aug 7 2017 Tom Callaway 2.9.7-9 - update fuse3 to 3.1.1 diff --git a/sources b/sources index c5e7950..865a264 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (fuse-2.9.7.tar.gz) = 960a576352663cfb730abd0020103c45f6fd8873d08ca40565a61421a7a80c110b31e88db5f45fc7e3d5e8b7a16a9e973483eda42c58c430dfb0599bc952800b -SHA512 (fuse-3.1.1.tar.gz) = 98424604f2ae3d3d0bf0c74612f2e7a1b87c3c2c96050f3ca08f5d33ab6a400301f3df79020ea8a865d9d35dd975e53f4c04712dc44649c570065849a1bb1e74 +SHA512 (fuse-3.2.1.tar.gz) = a3342c565481abf5668be907a6688ccfe9741bfd9ab0d996d3fd540487dc96407309166873d69df020df13cd55ec1bc27ce37dee649c5cede56056a4ec7a19c0