Merge branch 'jb38578' into 'master'

Rename coreutils-docs to coreutils-doc. JB#38578

See merge request mer-core/coreutils!2

coreutils.changes

@@ -1,3 +1,6 @@
+* Thu Jan 03 2019 Tomi Leppänen <tomi.leppanen@jolla.com> - 6.9-10
+- [packaging] Rename coreutils-docs to coreutils-doc. Contributes to JB#38578
+
 * Sat Apr 20 2013 Marko Saukko <marko.saukko@jollamobile.com> - 6.9
 - Drop su as it is now part of util-linux
 - Cleanup packaging a bit
@@ -89,7 +92,7 @@
 * Mon Nov 03 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-17
 - Requires: ncurses (#469277)
 
-* Wed Oct 21 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-16
+* Tue Oct 21 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-16
 - make possible to disable capability in ls due to
   performance impact when not cached(#467508)
 - do not patch generated manpages - generate them at build
@@ -132,7 +135,7 @@
 * Mon Aug 04 2008 Kamil Dudka <kdudka@redhat.com> - 6.12-8
 - ls -U1 now uses constant memory
 
-* Wed Jul 24 2008 Kamil Dudka <kdudka@redhat.com> - 6.12-7
+* Thu Jul 24 2008 Kamil Dudka <kdudka@redhat.com> - 6.12-7
 - dd: iflag=fullblock now read full blocks if possible
   (#431997, #449263)
 - ls: --color now highlights files with capabilities (#449985)
@@ -534,11 +537,11 @@
 - Parametrize SELinux (bug #174067).
 - Fix runuser.pamd (bug #173807).
 
-* Thu Nov 25 2005 Tim Waugh <twaugh@redhat.com> 5.93-4
+* Fri Nov 25 2005 Tim Waugh <twaugh@redhat.com> 5.93-4
 - Rebuild to pick up new glibc *at functions.
 - Apply runuser PAM patch from bug #173807.  Ship runuser PAM file.
 
-* Tue Nov 14 2005 Dan Walsh <dwalsh@redhat.com> 5.93-3
+* Mon Nov 14 2005 Dan Walsh <dwalsh@redhat.com> 5.93-3
 - Remove multiple from su.pamd
 
 * Mon Nov 14 2005 Tim Waugh <twaugh@redhat.com> 5.93-2
@@ -578,7 +581,7 @@
 - Allow id to run even when SELinux security context can not be run
 - Change chcon to use raw functions.
 
-* Thu Jun 28 2005 Tim Waugh <twaugh@redhat.com>
+* Tue Jun 28 2005 Tim Waugh <twaugh@redhat.com>
 - Corrected comments in DIR_COLORS.xterm (bug #161711).
 
 * Wed Jun 22 2005 Tim Waugh <twaugh@redhat.com> 5.2.1-52
@@ -616,7 +619,7 @@
 * Thu Mar 24 2005 Tim Waugh <twaugh@redhat.com> 5.2.1-43
 - Removed patch that adds -C option to install(1).
 
-* Wed Mar 14 2005 Tim Waugh <twaugh@redhat.com> 5.2.1-42
+* Mon Mar 14 2005 Tim Waugh <twaugh@redhat.com> 5.2.1-42
 - Fixed pam patch.
 - Fixed broken configure test.
 - Fixed build with GCC 4 (bug #151045).
@@ -633,7 +636,7 @@
 * Thu Jan 13 2005 Tim Waugh <twaugh@redhat.com> 5.2.1-37
 - Fixed zh_CN translation (bug #144845).  Patch from Mitrophan Chin.
 
-* Mon Dec 28 2004 Dan Walsh <dwalsh@redhat.com> 5.2.1-36
+* Tue Dec 28 2004 Dan Walsh <dwalsh@redhat.com> 5.2.1-36
 - Fix to only setdefaultfilecon if not overridden by command line
 
 * Mon Dec 27 2004 Dan Walsh <dwalsh@redhat.com> 5.2.1-35
@@ -929,7 +932,7 @@
 * Mon Jul 28 2003 Tim Waugh <twaugh@redhat.com> 5.0-8
 - Actually use the ACL patch (bug #100519).
 
-* Wed Jul 18 2003 Dan Walsh <dwalsh@redhat.com> 5.0-7
+* Fri Jul 18 2003 Dan Walsh <dwalsh@redhat.com> 5.0-7
 - Convert to SELinux
 
 * Mon Jun  9 2003 Tim Waugh <twaugh@redhat.com>

coreutils.spec

@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.9
-Release: 9
+Release: 10
 License: GPLv2+
 Epoch: 1
 Group:   System Environment/Base
@@ -75,6 +75,15 @@ Conflicts: util-linux < 2.22.2
 These are the GNU core utilities.  This package is the combination of
 the old GNU fileutils, sh-utils, and textutils packages.
 
+%package doc
+Summary:   Documentation for %{name}
+Group:     Documentation
+Requires:  %{name} = %{version}-%{release}
+Obsoletes: %{name}-docs
+
+%description doc
+Man and info pages for %{name}.
+
 %prep
 %setup -q -b 1
 
@@ -207,15 +216,20 @@ find %{buildroot}%{_datadir}/locale -type l | \
 # (sb) Deal with Installed (but unpackaged) file(s) found
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-%lang_package
+# Documentation
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m0644 -t $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
+        AUTHORS ChangeLog.bz2 ChangeLog-2005 NEWS README \
+        THANKS THANKS-to-translators TODO
+cp -r old/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-%docs_package
+%lang_package
 
 %files 
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/DIR_COLORS*
 %{_sysconfdir}/profile.d/*
-%doc COPYING 
+%license COPYING
 /bin/basename
 /bin/cat
 /bin/chgrp
@@ -251,3 +265,8 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %_bindir/*
 %_sbindir/chroot
 
+%files doc
+%defattr(-,root,root,-)
+%{_infodir}/coreutils.info.gz
+%{_mandir}/man1/*
+%{_docdir}/%{name}-%{version}