- up to 3.2.0; uses meson now; drops static subpackage

diff --git a/kernel-misc-fuse-Makefile.am.patch b/kernel-misc-fuse-Makefile.am.patch
deleted file mode 100644 (file)
index 4bb9acb..0000000
--- a/kernel-misc-fuse-Makefile.am.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- fuse-3.1.1/util/Makefile.am~       2017-08-13 10:11:40.000000000 +0200
-+++ fuse-3.1.1/util/Makefile.am        2017-08-13 10:12:53.514733029 +0200
-@@ -15,14 +15,6 @@ mount_util.c: $(top_srcdir)/lib/mount_ut
- 
- mount_fuse3_SOURCES = mount.fuse.c
- 
--install-exec-hook:
--      -chmod u+s $(DESTDIR)$(bindir)/fusermount3
--      @if test ! -e $(DESTDIR)/dev/fuse; then \
--              $(MKDIR_P) $(DESTDIR)/dev; \
--              echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
--              mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
--      fi
--
- EXTRA_DIST = udev.rules init_script meson.build install_helper.sh
- 
- MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
-@@ -34,10 +26,6 @@ install-exec-local:
-       $(INSTALL_PROGRAM) $(builddir)/mount.fuse3 $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse3
-       $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
-       $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse3
--      @if test -x /usr/sbin/update-rc.d; then \
--              echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
--              /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
--      fi
- 
- install-data-local:
-       $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_PATH)

diff --git a/libfuse3-build.patch b/libfuse3-build.patch
new file mode 100644 (file)
index 0000000..0cea4ae
--- /dev/null
+++ b/libfuse3-build.patch
@@ -0,0 +1,28 @@
+--- fuse-3.2.0/util/install_helper.sh.org      2017-10-31 08:57:43.252484720 +0100
++++ fuse-3.2.0/util/install_helper.sh  2017-10-31 08:58:09.556525269 +0100
+@@ -11,25 +11,9 @@ bindir="$2"
+ udevrulesdir="$3"
+ prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
+ 
+-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"
+ 
+ install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
+         "${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 ${DESTDIR}/etc/init.d/fuse3 init script"
+-fi
+-
+-

diff --git a/libfuse3.spec b/libfuse3.spec
index edd81c6eba6b707068247780c6377ba1a4a5b1e7..8f17cb2be366959a39f1dd35feca4ff41720dc5d 100644 (file)
--- a/libfuse3.spec
+++ b/libfuse3.spec
@@ -1,19 +1,17 @@
 Summary:       Filesystem in Userspace
 Summary(pl.UTF-8):     System plików w przestrzeni użytkownika
 Name:          libfuse3
-Version:       3.1.1
+Version:       3.2.0
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 #Source0Download: https://github.com/libfuse/libfuse/releases
-Source0:       https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.gz
-# Source0-md5: 20b10f24b825062c1db9a21a35157f97
+Source0:       https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz
+# Source0-md5: 79e862bf915864aceef179607c0b3e4d
 Source1:       fuse.conf
-Patch0:                kernel-misc-fuse-Makefile.am.patch
+Patch0:                %{name}-build.patch
 URL:           https://github.com/libfuse/libfuse
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: meson
 BuildRequires: sed >= 4.0
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
@@ -50,18 +48,6 @@ Libfuse library header files.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libfuse.
 
-%package static
-Summary:       Filesytem in Userspace - static library
-Summary(pl.UTF-8):     System plików w przestrzeni użytkownika - biblioteka statyczna
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static libfuse libraries.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libfuse.
-
 %prep
 %setup -q -n fuse-%{version}
 %patch0 -p1
@@ -74,42 +60,34 @@ install -d ld-dir
 
 %build
 PATH=$(pwd)/ld-dir:$PATH
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       INIT_D_PATH=/etc/rc.d/init.d \
-       --sbindir=/sbin \
-       --disable-silent-rules \
-       --enable-lib \
-       --enable-util
-
-%{__make}
+
+%meson build
+
+%meson_build -C build
+
+%{?with_tests:%meson_test -C build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},%{_pkgconfigdir},%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir},/sbin}
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/libfuse3.so.* $RPM_BUILD_ROOT/%{_lib}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libfuse3.so
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libfuse3.so.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libfuse3.so
 
-cp -p fuse3.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
-mv $RPM_BUILD_ROOT%{_mandir}/man8/mount.fuse{,3}.8
+mv $RPM_BUILD_ROOT{%{_sbindir},/sbin}/mount.fuse3
+mv $RPM_BUILD_ROOT%{_mandir}/man8/mount.fuse{,3}.8.gz
 
 # part of default udev rules nowdays
-rm $RPM_BUILD_ROOT%{_libdir}/udev/rules.d/99-fuse3.rules
+rm $RPM_BUILD_ROOT/lib/udev/rules.d/99-fuse3.rules
 
 # not needed
-rm $RPM_BUILD_ROOT/etc/rc.d/init.d/fuse3
+rm $RPM_BUILD_ROOT/etc/init.d/fuse3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,10 +112,5 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfuse3.so
-%{_libdir}/libfuse3.la
 %{_includedir}/fuse3
 %{_pkgconfigdir}/fuse3.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libfuse3.a