SPECS: kernel-vanilla.spec - package {utsrelease, version}.h - rpmb...

[glen]

Author: glen                         Date: Tue Feb 12 21:28:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package {utsrelease,version}.h
- rpmbuild macros needed which understand our -config subpackage

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.127 SPECS/kernel-vanilla.spec:1.128
--- SPECS/kernel-vanilla.spec:1.127	Tue Feb 12 09:33:06 2008
+++ SPECS/kernel-vanilla.spec	Tue Feb 12 22:28:51 2008
@@ -265,6 +265,7 @@
 Summary:	Kernel config and module symvers
 Group:		Development/Building
 Autoreqprov:	no
+Conflicts:	rpmbuild(macros) < 1.433
 
 %description config
 Kernel config and module symvers.
@@ -473,7 +474,7 @@
 rm -rf $RPM_BUILD_ROOT
 # touch for noarch build (exclude list)
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-touch $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
+touch $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/{utsrelease,version,autoconf-dist}.h
 
 %if %{without noarch}
 %{__make} %{MakeOpts} %{!?with_verbose:-s} modules_install \
@@ -525,6 +526,7 @@
 cp -a %{objdir}/Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
 cp -a %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
 cp -a %{objdir}/include/linux/autoconf.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
+cp -a %{objdir}/include/linux/{utsrelease,version}.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
 %endif # arch dependant
 
 %if %{with noarch}
@@ -740,6 +742,8 @@
 %{_kernelsrcdir}/config-dist
 %{_kernelsrcdir}/Module.symvers-dist
 %{_kernelsrcdir}/include/linux/autoconf-dist.h
+%{_kernelsrcdir}/include/linux/utsrelease.h
+%{_kernelsrcdir}/include/linux/version.h
 %endif # noarch package
 
 %if %{with noarch}
@@ -748,6 +752,8 @@
 %dir %{_kernelsrcdir}
 %{_kernelsrcdir}/include
 %exclude %{_kernelsrcdir}/include/linux/autoconf-dist.h
+%exclude %{_kernelsrcdir}/include/linux/utsrelease.h
+%exclude %{_kernelsrcdir}/include/linux/version.h
 
 %files module-build -f aux_files
 %defattr(644,root,root,755)
@@ -813,6 +819,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2008-02-12 21:28:51  glen
+- package {utsrelease,version}.h
+- rpmbuild macros needed which understand our -config subpackage
+
 Revision 1.127  2008-02-12 08:33:06  glen
 - R: /sbin/depmod, due vserver-packages having provide on module-init-tools
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.127&r2=1.128&f=u