Merge branch 'jb24119' into 'master'

Add fuse-doc subpackage. JB#24119

See merge request mer-core/fuse!2

rpm/fuse.spec

@@ -1,13 +1,4 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.26
-# 
-
 Name:       fuse
-
-# >> macros
-# << macros
-
 Summary:    File System in Userspace (FUSE) utilities
 Version:    2.9.0
 Release:    1
@@ -28,7 +19,6 @@ With FUSE it is possible to implement a fully functional filesystem in a
 userspace program. This package contains the FUSE userspace tools to
 mount a FUSE filesystem.
 
-
 %package devel
 Summary:    File System in Userspace (FUSE) devel files
 Group:      Development/Libraries
@@ -39,7 +29,6 @@ With FUSE it is possible to implement a fully functional filesystem in a
 userspace program. This package contains development files (headers,
 pgk-config) to develop FUSE based applications/filesystems.
 
-
 %package libs
 Summary:    File System in Userspace (FUSE) libraries
 Group:      System/Libraries
@@ -51,6 +40,13 @@ Requires(postun): /sbin/ldconfig
 Devel With FUSE it is possible to implement a fully functional filesystem in a
 userspace program. This package contains the FUSE libraries.
 
+%package doc
+Summary:   Documentation for %{name}
+Group:     Documentation
+Requires:  %{name} = %{version}-%{release}
+
+%description doc
+Man pages for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}/%{name}
@@ -61,14 +57,10 @@ userspace program. This package contains the FUSE libraries.
 %patch1 -p1
 # 200-backport_arm64_fuse_kernel_h_clean_includes.patch
 %patch2 -p1
-# >> setup
-# << setup
 
 %build
-# >> build pre
 export UDEV_RULES_PATH=/lib/udev/rules.d
 ./makeconf.sh
-# << build pre
 
 %configure --disable-static \
     --bindir=/bin \
@@ -77,61 +69,57 @@ export UDEV_RULES_PATH=/lib/udev/rules.d
 
 make %{?jobs:-j%jobs}
 
-# >> build post
-# << build post
 
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
 
-# >> install post
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}.conf
 %ifnarch %{ix86} x86_64
 # HACK!!! Please remove when possible.
 # For some reason /dev/fuse doesn't exist on ARM builds and make install
 # creates the node which doesn't belong to the package, thus these lines.
-rm %{buildroot}/dev/fuse
-rm -r %{buildroot}/dev
+rm -f %{buildroot}/dev/fuse
+rm -rf  %{buildroot}/dev
 %endif
-# << install post
+
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
+install -m0644 -t %{buildroot}%{_docdir}/%{name}-%{version} \
+        AUTHORS ChangeLog FAQ Filesystems NEWS README README.NFS
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-# >> files
-%doc COPYING
+%license COPYING
 /sbin/mount.fuse
 %attr(4755,root,root) /bin/fusermount
 /bin/ulockmgr_server
 %exclude %{_sysconfdir}/init.d/fuse
 %config /lib/udev/rules.d/99-fuse.rules
-%{_mandir}/man1/fusermount.1.gz
-%{_mandir}/man1/ulockmgr_server.1.gz
-%{_mandir}/man8/mount.fuse.8.gz
 %config(noreplace) %{_sysconfdir}/%{name}.conf
-# << files
 
 %files devel
 %defattr(-,root,root,-)
-# >> files devel
-%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS
+%license COPYING
 %{_libdir}/libfuse.so
 %{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
 %{_includedir}/ulockmgr.h
 %{_includedir}/fuse
-# << files devel
 
 %files libs
 %defattr(-,root,root,-)
-# >> files libs
-%doc COPYING.LIB
+%license COPYING.LIB
 %{_libdir}/libfuse.so.*
 %{_libdir}/libulockmgr.so.*
-# << files libs
+
+%files doc
+%defattr(-,root,root,-)
+%{_mandir}/man1/fusermount.1.gz
+%{_mandir}/man1/ulockmgr_server.1.gz
+%{_mandir}/man8/mount.fuse.8.gz
+%{_docdir}/%{name}-%{version}