packages (LINUX_2_6_28): kernel/kernel.spec - move -doc files to %{_docdir}

[glen]

Author: glen                         Date: Fri Oct 30 17:41:56 2009 GMT
Module: packages                      Tag: LINUX_2_6_28
---- Log message:
- move -doc files to %{_docdir}

---- Files affected:
packages/kernel:
   kernel.spec (1.441.2.2083.2.13 -> 1.441.2.2083.2.14) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.441.2.2083.2.13 packages/kernel/kernel.spec:1.441.2.2083.2.14
--- packages/kernel/kernel.spec:1.441.2.2083.2.13	Fri Oct 30 18:07:24 2009
+++ packages/kernel/kernel.spec	Fri Oct 30 18:41:50 2009
@@ -530,19 +530,6 @@
 %description vmlinux -l pl.UTF-8
 vmlinux - rozpakowany obraz jądra.
 
-%package dirs
-Summary:	common dirs for kernel packages
-Summary(pl.UTF-8):	Katalogi wspólne dla pakietów kernela
-Group:		Base/Kernel
-
-%description dirs
-This package provides common dirs shared between various kernel
-packages.
-
-%description dirs -l pl.UTF-8
-Katalog ten udostepnia katalogi współdzielone pomiędzy różnymi
-pakietami kernela.
-
 %package drm
 Summary:	DRM kernel modules
 Summary(de.UTF-8):	DRM Kernel Treiber
@@ -1358,6 +1345,10 @@
 # remove unnecessary dir with dead symlink
 rm -rf $RPM_BUILD_ROOT/arch/i386
 
+# move to %{_docdir} so we wouldn't depend on any kernel package for dirs
+install -d $RPM_BUILD_ROOT%{_docdir}
+mv $RPM_BUILD_ROOT{%{_kernelsrcdir}/Documentation,%{_docdir}/%{name}-%{version}}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1518,10 +1509,6 @@
 %ghost /lib/modules/%{kernel_release}/source
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
-%files dirs
-%defattr(644,root,root,755)
-%dir %{_kernelsrcdir}
-
 %ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
 %files vmlinux
 %defattr(644,root,root,755)
@@ -1600,6 +1587,7 @@
 
 %files headers
 %defattr(644,root,root,755)
+%dir %{_kernelsrcdir}
 %{_kernelsrcdir}/include
 %dir %{_kernelsrcdir}/arch
 %dir %{_kernelsrcdir}/arch/[!K]*
@@ -1700,6 +1688,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.2083.2.14  2009/10/30 17:41:50  glen
+- move -doc files to %{_docdir}
+
 Revision 1.441.2.2083.2.13  2009/10/30 17:07:24  glen
 - caps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.441.2.2083.2.13&r2=1.441.2.2083.2.14&f=u