- all suid and group stuff moved to -tools (libfuse based packages should R: libfuse...

- fuse.conf will be provided by libfuse-common built from libfuse3.spec to resolve file conflict
- separated -apidocs with doxygen documentation
- library license is LGPL
- release 3

diff --git a/fuse.conf b/fuse.conf
deleted file mode 100644 (file)
index 3c9b6ac..0000000
--- a/fuse.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# The file /etc/fuse.conf allows for the following parameters:
-#
-# user_allow_other - Using the allow_other mount option works fine as root, in
-# order to have it work as user you need user_allow_other in /etc/fuse.conf as
-# well. (This option allows users to use the allow_other option.) You need
-# allow_other if you want users other than the owner to access a mounted fuse.
-# This option must appear on a line by itself. There is no value, just the
-# presence of the option.
-
-#user_allow_other
-
-
-# mount_max = n - this option sets the maximum number of mounts.
-# Currently (2014) it must be typed exactly as shown
-# (with a single space before and after the equals sign).
-
-#mount_max = 1000

diff --git a/libfuse.spec b/libfuse.spec
index 0f20af8a232edef5f5ad091c7ab90d30abf511d4..f1f76bd2e7191dbecbebadb0a2e7dce7f742eaa4 100644 (file)
--- a/libfuse.spec
+++ b/libfuse.spec
@@ -2,23 +2,18 @@ Summary:      Filesystem in Userspace
 Summary(pl.UTF-8):     System plików w przestrzeni użytkownika
 Name:          libfuse
 Version:       2.9.7
-Release:       2
-License:       GPL v2
+Release:       3
+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: 9bd4ce8184745fd3d000ca2692adacdb
-Source1:       fuse.conf
 Patch0:                kernel-misc-fuse-Makefile.am.patch
 URL:           https://github.com/libfuse/libfuse
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: sed >= 4.0
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Provides:      group(fuse)
-Suggests:      mount >= 2.18
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,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}
 
@@ -53,6 +49,7 @@ Pliki nagłówkowe bibliotek FUSE.
 %package static
 Summary:       Filesystem in Userspace - static libraries
 Summary(pl.UTF-8):     System plików w przestrzeni użytkownika - biblioteki statyczne
+License:       LGPL v2
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -62,6 +59,36 @@ Static FUSE libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki FUSE.
 
+%package apidocs
+Summary:       API documentation for FUSE library
+Summary(pl.UTF-8):     Dokumentacja API bibliotek FUSE
+Group:         Documentation
+
+%description apidocs
+API documentation for FUSE library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek FUSE.
+
+%package tools
+Summary:       Tools to mount FUSE based filesystems
+Summary(pl.UTF-8):     Narzędzia do montowania systemów plików opartych na FUSE
+License:       GPL v2
+Group:         Applications/System
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires:      %{name} = %{version}-%{release}
+Requires:      libfuse-common >= %{version}
+Requires:      mount >= 2.18
+Provides:      group(fuse)
+Obsoletes:     fusermount
+
+%description tools
+Tools to mount FUSE based filesystems.
+
+%description tools -l pl.UTF-8
+Narzędzia do montowania systemów plików opartych na FUSE.
+
 %prep
 %setup -q -n fuse-%{version}
 %patch0 -p1
@@ -94,43 +121,35 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_pkgconfigdir},%{_sysconfdir}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libfuse.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libfuse.so.* $RPM_BUILD_ROOT/%{_lib}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libfuse.so
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libfuse.so.*.*) \
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libfuse.so.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libfuse.so
 
 install fuse.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
 # part of default udev rules nowdays
-rm $RPM_BUILD_ROOT/etc/udev/rules.d/99-fuse.rules
+%{__rm} $RPM_BUILD_ROOT/etc/udev/rules.d/99-fuse.rules
 
 # not needed
-rm $RPM_BUILD_ROOT/etc/rc.d/init.d/fuse
+%{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/fuse
 
 %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 NEWS ChangeLog AUTHORS doc/*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fuse.conf
-%attr(4755,root,root) %{_bindir}/fusermount
-%attr(755,root,root) %{_bindir}/ulockmgr_server
-%attr(755,root,root) /sbin/mount.fuse
+%doc README.md NEWS ChangeLog AUTHORS doc/{how-fuse-works,kernel.txt}
 %attr(755,root,root) /%{_lib}/libfuse.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libfuse.so.2
 %attr(755,root,root) %{_libdir}/libulockmgr.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libulockmgr.so.1
-%{_mandir}/man1/fusermount.1*
-%{_mandir}/man1/ulockmgr_server.1*
-%{_mandir}/man8/mount.fuse.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -147,3 +166,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libfuse.a
 %{_libdir}/libulockmgr.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
+
+%files tools
+%defattr(644,root,root,755)
+%attr(4755,root,root) %{_bindir}/fusermount
+%attr(755,root,root) %{_bindir}/ulockmgr_server
+%attr(755,root,root) /sbin/mount.fuse
+%{_mandir}/man1/fusermount.1*
+%{_mandir}/man1/ulockmgr_server.1*
+%{_mandir}/man8/mount.fuse.8*