X-Git-Url: https://git.pld-linux.org/?p=packages%2Flibfuse3.git;a=blobdiff_plain;f=libfuse3.spec;h=f319b4125def9f329cd06dbdb6186144e728257a;hp=edd81c6eba6b707068247780c6377ba1a4a5b1e7;hb=82ce71f;hpb=54a113e9da8c96b110f7ce6fdca8bf62435a6c06

diff --git a/libfuse3.spec b/libfuse3.spec
index edd81c6..f319b41 100644
--- a/libfuse3.spec
+++ b/libfuse3.spec
@@ -1,24 +1,22 @@
 Summary:	Filesystem in Userspace
 Summary(pl.UTF-8):	System plików w przestrzeni użytkownika
 Name:		libfuse3
-Version:	3.1.1
+# NOTE: fuse-3.9.4 tag from 20200809 points to 3.9.3 release
+Version:	3.10.1
 Release:	1
-License:	GPL v2
+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.gz
-# Source0-md5:	20b10f24b825062c1db9a21a35157f97
-Source1:	fuse.conf
-Patch0:		kernel-misc-fuse-Makefile.am.patch
+Source0:	https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.xz
+# Source0-md5:	e973012119e98b048307558271b5b296
+Patch0:		%{name}-build.patch
 URL:		https://github.com/libfuse/libfuse
-BuildRequires:	autoconf >= 2.60
-BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	meson >= 0.42
+BuildRequires:	ninja >= 1.5
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sed >= 4.0
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Suggests:	mount >= 2.18
-Provides:	group(fuse)
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,34 +37,78 @@ montowania własnych implementacji systemów plików przez zwykłych
 Ten pakiet zawiera bibliotekę współdzieloną.
 
 %package devel
-Summary:	Filesytem in Userspace - Development header files
+Summary:	Filesystem in Userspace - Development header files
 Summary(pl.UTF-8):	System plików w przestrzeni użytkownika - pliki nagłówkowe
+License:	LGPL v2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Libfuse library header files.
+Libfuse3 library header files.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki libfuse.
+Pliki nagłówkowe biblioteki libfuse3.
 
 %package static
-Summary:	Filesytem in Userspace - static library
+Summary:	Filesystem in Userspace - static library
 Summary(pl.UTF-8):	System plików w przestrzeni użytkownika - biblioteka statyczna
+License:	LGPL v2
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static libfuse libraries.
+Static libfuse3 library.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka libfuse.
+Statyczna biblioteka libfuse3.
+
+%package apidocs
+Summary:	API documentation for FUSE 3 library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki FUSE 3
+Group:		Documentation
+
+%description apidocs
+API documentation for FUSE 3 library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki FUSE 3.
+
+%package -n libfuse-common
+Summary:	Common package for FUSE 2 and FUSE 3
+Summary(pl.UTF-8):	Pliki wspólne dla FUSE 2 i FUSE 3
+Group:		Libraries
+Conflicts:	libfuse < 2.9.7-3
+Conflicts:	libfuse3 < 3.2.4-2
+
+%description -n libfuse-common
+Common package for FUSE 2 and FUSE 3.
+
+%description -n libfuse-common -l pl.UTF-8
+Pliki wspólne dla FUSE 2 i FUSE 3.
+
+%package tools
+Summary:	Tools to mount FUSE 3 based filesystems
+Summary(pl.UTF-8):	Narzędzia do montowania systemów plików opartych na FUSE 3
+License:	GPL v2
+Group:		Applications/System
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires:	%{name} = %{version}-%{release}
+Requires:	libfuse-common = %{version}-%{release}
+Requires:	mount >= 2.18
+Provides:	group(fuse)
+
+%description tools
+Tools to mount FUSE 3 based filesystems.
+
+%description tools -l pl.UTF-8
+Narzędzia do montowania systemów plików opartych na FUSE 3.
 
 %prep
 %setup -q -n fuse-%{version}
 %patch0 -p1
 
-sed -i '/FUSERMOUNT_PROG/s,fusermount3,%{_bindir}/fusermount3,' lib/mount.c
+%{__sed} -i '/FUSERMOUNT_PROG/s,fusermount3,%{_bindir}/fusermount3,' lib/mount.c
 
 # gold is missing base versioning
 install -d ld-dir
@@ -74,70 +116,69 @@ 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 \
+	-Duseroot=false
+
+%ninja_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
+%ninja_install -C build
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libfuse3.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $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.*.*) \
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/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
 
 # 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
 
-%pre
-%groupadd -g 84 fuse
-
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%pre tools
+%groupadd -g 84 fuse
+
 %files
 %defattr(644,root,root,755)
-%doc README.md ChangeLog.rst AUTHORS doc/*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fuse.conf
-%attr(4755,root,root) %{_bindir}/fusermount3
-%attr(755,root,root) /sbin/mount.fuse3
+%doc README.md ChangeLog.rst AUTHORS doc/{README.NFS,fast17-vangoor.pdf,kernel.txt}
 %attr(755,root,root) /%{_lib}/libfuse3.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libfuse3.so.3
-%{_mandir}/man1/fusermount3.1*
-%{_mandir}/man8/mount.fuse3.8*
 
 %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
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
+
+%files -n libfuse-common
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fuse.conf
+
+%files tools
+%defattr(644,root,root,755)
+%attr(4755,root,root) %{_bindir}/fusermount3
+%attr(755,root,root) /sbin/mount.fuse3
+%{_mandir}/man1/fusermount3.1*
+%{_mandir}/man8/mount.fuse3.8*