From: Jan Palus Date: Tue, 9 Jul 2019 13:55:04 +0000 (+0200) Subject: up to 3.6.2 X-Git-Tag: auto/th/libfuse3-3.6.2-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Flibfuse3.git;a=commitdiff_plain;h=5c3c00a up to 3.6.2 --- diff --git a/libfuse3-build.patch b/libfuse3-build.patch index 2c0ee54..e68c457 100644 --- a/libfuse3-build.patch +++ b/libfuse3-build.patch @@ -1,33 +1,17 @@ ---- fuse-3.2.6/util/install_helper.sh.orig 2018-08-31 19:12:16.706833727 +0200 -+++ fuse-3.2.6/util/install_helper.sh 2018-08-31 19:14:32.389406619 +0200 -@@ -22,30 +22,12 @@ - DESTDIR="${DESTDIR%/}" - fi - --chown root:root "${DESTDIR}${bindir}/fusermount3" --chmod u+s "${DESTDIR}${bindir}/fusermount3" -- - install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ - "${DESTDIR}${sysconfdir}/fuse.conf" - - --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 -urN fuse-3.6.2.orig/util/install_helper.sh fuse-3.6.2/util/install_helper.sh +--- fuse-3.6.2.orig/util/install_helper.sh 2019-07-09 15:49:51.220446659 +0200 ++++ fuse-3.6.2/util/install_helper.sh 2019-07-09 15:50:11.386996522 +0200 +@@ -41,13 +41,3 @@ install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ - "${DESTDIR}${sysconfdir}/init.d/fuse3" + "${DESTDIR}/etc/init.d/fuse3" - - -if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then - /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true -else - echo "== FURTHER ACTION REQUIRED ==" -- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" +- echo "Make sure that your init system will start the ${DESTDIR}/etc/init.d/fuse3 init script" -fi - - diff --git a/libfuse3.spec b/libfuse3.spec index c4976ec..4951f1e 100644 --- a/libfuse3.spec +++ b/libfuse3.spec @@ -1,13 +1,13 @@ Summary: Filesystem in Userspace Summary(pl.UTF-8): System plików w przestrzeni użytkownika Name: libfuse3 -Version: 3.6.1 +Version: 3.6.2 Release: 1 License: LGPL v2 (library), GPL v2 (tools) Group: Applications/System #Source0Download: https://github.com/libfuse/libfuse/releases Source0: https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz -# Source0-md5: 92aaf6209c6de7b1d278eaf0dca1454a +# Source0-md5: 1798945aa69434286723b9999a141c7a Patch0: %{name}-build.patch URL: https://github.com/libfuse/libfuse BuildRequires: meson >= 0.42 @@ -114,7 +114,8 @@ install -d ld-dir %build PATH=$(pwd)/ld-dir:$PATH -%meson build +%meson build \ + -Duseroot=false %meson_build -C build