From 3333c5eedf485537e69e4e31349806b6ed5e6809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 15 Oct 2010 21:07:35 +0300 Subject: [PATCH] - Move doc dir ownership to main package. - Preserve doc timestamps. - Add --without tests option for building without running the test suite. Signed-off-by: Roman Rakus --- bash.spec | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/bash.spec b/bash.spec index 92ef29e..5ad2e2e 100644 --- a/bash.spec +++ b/bash.spec @@ -1,11 +1,12 @@ #% define beta_tag rc1 %define patchleveltag .9 %define baseversion 4.1 +%bcond_without tests Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Shells License: GPLv3+ Url: http://www.gnu.org/software/bash @@ -123,8 +124,6 @@ autoconf # and new fork's pid is also X, bash has to wait for this same pid. # Without Recycles pids bash will not wait. make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS `getconf LFS_CFLAGS`" -%check -make check %install rm -rf $RPM_BUILD_ROOT @@ -205,11 +204,20 @@ done %find_lang %{name} # copy doc to /usr/share/doc +cat /dev/null > %{name}-doc.files mkdir -p $RPM_BUILD_ROOT/%{pkgdocdir} -for file in COPYING CHANGES COMPAT NEWS NOTES POSIX doc examples +cp -p COPYING $RPM_BUILD_ROOT/%{pkgdocdir} +for file in CHANGES COMPAT NEWS NOTES POSIX doc examples do - cp -r "$file" $RPM_BUILD_ROOT/%{pkgdocdir} + cp -rp "$file" $RPM_BUILD_ROOT/%{pkgdocdir} + echo "%%doc %{pkgdocdir}/$file" >> %{name}-doc.files done + +%if %{with tests} +%check +make check +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -265,20 +273,25 @@ fi %config(noreplace) /etc/skel/.b* /bin/sh /bin/bash +%dir %{pkgdocdir}/ %doc %{pkgdocdir}/COPYING %attr(0755,root,root) %{_bindir}/bashbug-* %{_infodir}/bash.info* %{_mandir}/*/* %{_mandir}/*/..1* -%files doc +%files doc -f %{name}-doc.files %defattr(-, root, root) -%doc %{pkgdocdir} # For now there isn't any doc #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Fri Oct 15 2010 Ville Skyttä - 4.1.9-2 +- Move doc dir ownership to main package. +- Preserve doc timestamps. +- Add --without tests option for building without running the test suite. + * Thu Oct 14 2010 Roman Rakus - 4.1.9-1 - Patch level 9