[packages/libfuse3] - all suid and group stuff moved to -tools (libfuse3 based packages should R: libfuse3-tools now) -

qboosh qboosh at pld-linux.org
Sat Jul 21 17:45:27 CEST 2018


commit da32b10ce9d501943a1e199be4b5ab3fcd28ffa9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 21 17:47:22 2018 +0200

    - all suid and group stuff moved to -tools (libfuse3 based packages should R: libfuse3-tools now)
    - fuse.conf is provided by libfuse-common to resolve file conflict
    - separated -apidocs with doxygen documentation
    - library license is LGPL
    - release 2

 libfuse3.spec | 86 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 18 deletions(-)
---
diff --git a/libfuse3.spec b/libfuse3.spec
index aac2743..f354912 100644
--- a/libfuse3.spec
+++ b/libfuse3.spec
@@ -2,22 +2,18 @@ Summary:	Filesystem in Userspace
 Summary(pl.UTF-8):	System plików w przestrzeni użytkownika
 Name:		libfuse3
 Version:	3.2.4
-Release:	1
-License:	GPL v2
+Release:	2
+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:	19cb175ebd2d9cfa78a857e0129d9b0a
 Patch0:		%{name}-build.patch
 URL:		https://github.com/libfuse/libfuse
-BuildRequires:	meson
+BuildRequires:	meson >= 0.38
 # for --default_library=both
 BuildRequires:	rpmbuild(macros) >= 1.732
 BuildRequires:	sed >= 4.0
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Suggests:	mount >= 2.18
-Provides:	group(fuse)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,6 +36,7 @@ Ten pakiet zawiera bibliotekę współdzieloną.
 %package devel
 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}
 
@@ -52,6 +49,7 @@ Pliki nagłówkowe biblioteki libfuse3.
 %package static
 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}
 
@@ -61,11 +59,53 @@ Static libfuse3 library.
 %description static -l pl.UTF-8
 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
@@ -88,7 +128,7 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir},/sbin}
 
 %{__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
 
 %{__mv} $RPM_BUILD_ROOT{%{_sbindir},/sbin}/mount.fuse3
@@ -102,22 +142,17 @@ ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libfuse3.so.*.*) \
 %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)
@@ -128,3 +163,18 @@ rm -rf $RPM_BUILD_ROOT
 %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*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libfuse3.git/commitdiff/da32b10ce9d501943a1e199be4b5ab3fcd28ffa9



More information about the pld-cvs-commit mailing list