SPECS: kernel-vanilla.spec - from -desktop kernel: source bcond, d...

[glen]

Author: glen                         Date: Thu Apr 10 20:47:52 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- from -desktop kernel: source bcond, desc updates

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.137 SPECS/kernel-vanilla.spec:1.138
--- SPECS/kernel-vanilla.spec:1.137	Wed Apr  9 02:08:03 2008
+++ SPECS/kernel-vanilla.spec	Thu Apr 10 22:47:47 2008
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	source		# don't build kernel-source package
 %bcond_with	noarch		# build noarch packages
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
@@ -68,7 +69,7 @@
 Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
 # Source0-md5:	3f23ad4b69d0a552042d1ed0f4399857
-Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{_basever}%{_postver}.bz2
+Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5:	508f5aaa99dead9836ff490496a61581
 Source2:	kernel-vanilla-module-build.pl
 Source3:	kernel-config.py
@@ -131,7 +132,7 @@
 %define		srcdir	%{topdir}/linux-%{_basever}
 %define		objdir	%{topdir}/o
 
-%define		CommonOpts	HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer" O=%{objdir}
+%define		CommonOpts	HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define	MakeOpts %{CommonOpts} ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
 	%define	DepMod /bin/true
@@ -291,7 +292,7 @@
 
 %description headers -l de.UTF-8
 Dies sind die C Header Dateien für den Linux-Kernel, die definierte
-Strukturen und Konstante beinhalten die beim rekompilieren des Kernels
+Strukturen und Konstante beinhalten, die beim rekompilieren des Kernels
 oder bei Kernel Modul kompilationen gebraucht werden.
 
 %description headers -l pl.UTF-8
@@ -358,7 +359,7 @@
 
 %description doc
 This is the documentation for the Linux kernel, as found in
-Documentation directory.
+/usr/src/linux/Documentation directory.
 
 %description doc -l de.UTF-8
 Dies ist die Kernel Dokumentation wie sie im 'Documentation'
@@ -366,7 +367,7 @@
 
 %description doc -l pl.UTF-8
 Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
-Documentation.
+/usr/src/linux/Documentation.
 
 %prep
 %setup -qc
@@ -788,6 +789,7 @@
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/Documentation
 
+%if %{with source}
 %files source -f aux_files_exc
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/arch/*/[!Mk]*
@@ -825,6 +827,7 @@
 %{_kernelsrcdir}/README
 %{_kernelsrcdir}/REPORTING-BUGS
 %endif
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -832,6 +835,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2008-04-10 20:47:47  glen
+- from -desktop kernel: source bcond, desc updates
+
 Revision 1.137  2008-04-09 00:08:03  zbyniu
 - typo
 
================================================================

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