rpms/kernel/devel Makefile,1.98,1.99 kernel.spec,1.1323,1.1324

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7181

Modified Files:
	Makefile kernel.spec 
Log Message:
* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com>
- regexp-ing up with_doc turns out to be fail. define a new var
  rawhide_skip_docs to 1 when we don't want to build them. tested with
  upcoming patch-2.6.29-rc6.bz2...



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Makefile	23 Feb 2009 07:56:13 -0000	1.98
+++ Makefile	23 Feb 2009 08:12:20 -0000	1.99
@@ -114,7 +114,7 @@
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
-	@perl -pi -e 's/^%define with_doc 0/#% define with_doc 0/' kernel.spec
+	@perl -pi -e 's/^%define rawhide_skip_docs 1/%define rawhide_skip_docs 0/' kernel.spec
 
 rhel:
 	@perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' config-powerpc64


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1323
retrieving revision 1.1324
diff -u -r1.1323 -r1.1324
--- kernel.spec	23 Feb 2009 07:56:14 -0000	1.1323
+++ kernel.spec	23 Feb 2009 08:12:20 -0000	1.1324
@@ -96,13 +96,17 @@
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
-%define with_doc 0
 %if 0%{?released_kernel}
 %define doc_build_fail false
 %else
 %define doc_build_fail true
 %endif
 
+%define rawhide_skip_docs 1
+%if 0%{?rawhide_skip_docs}
+%define with_doc 0
+%endif
+
 # Additional options for user-friendly one-off kernel building:
 #
 # Only build the base kernel (--with baseonly):
@@ -1747,6 +1751,11 @@
 
 %changelog
 * Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com>
+- regexp-ing up with_doc turns out to be fail. define a new var
+  rawhide_skip_docs to 1 when we don't want to build them. tested with
+  upcoming patch-2.6.29-rc6.bz2...
+
+* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com>
 - Build docs once per -rc rebase and when 'make release.'
 
 * Sun Feb 22 2009 Kyle McMartin <kyle at redhat.com>