SPECS: kernel-desktop.spec - cleanup

zbyniu zbyniu at pld-linux.org
Wed Apr 9 01:32:38 CEST 2008


Author: zbyniu                       Date: Tue Apr  8 23:32:38 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup

---- Files affected:
SPECS:
   kernel-desktop.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.172 SPECS/kernel-desktop.spec:1.173
--- SPECS/kernel-desktop.spec:1.172	Wed Apr  9 01:20:45 2008
+++ SPECS/kernel-desktop.spec	Wed Apr  9 01:32:33 2008
@@ -50,8 +50,6 @@
 %define		have_isa	0
 %endif
 
-%define		_enable_debug_packages			0
-
 %define		netfilter_snap		20061213
 
 %if %{with laptop}
@@ -65,6 +63,10 @@
 %define		_rel		0.1
 %define		_rc	%{nil}
 %define		pname	kernel-desktop
+
+%define		_enable_debug_packages			0
+
+%define		netfilter_snap		20061213
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):	Linuxi kernel (ehk operatsioonisüsteemi tuum)
@@ -142,9 +144,6 @@
 # tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
 Patch20:	%{pname}-tahoe9xx.patch
 
-# http://dev.gentoo.org/~spock/projects/vesafb-tng/archive/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
-#Patch22:	%{pname}-vesafb-tng.patch
-
 # http://pred.dcaf-security.org/sata_nv-ncq-support-mcp51-mcp55-mcp61.patch
 # NCQ Functionality for newer nvidia chipsets (MCP{51,55,61}) by nvidia crew
 #Patch25:	%{pname}-sata_nv-ncq.patch
@@ -259,7 +258,7 @@
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
-Conflicts:	module-init-tool < 0.9.10
+Conflicts:	module-init-tools < 0.9.10
 Conflicts:	nfs-utils < 1.0.5
 Conflicts:	oprofile < 0.9
 Conflicts:	ppp < 1:2.4.0
@@ -529,7 +528,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'
@@ -537,7 +536,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
@@ -594,7 +593,6 @@
 ### hardware
 %patch20 -p1
 %if 0
-#%patch22 -p1 # UVESAFB
 #%patch25 -p1 # FIND UPDATE
 %endif
 # toshiba-acpi
@@ -664,7 +662,6 @@
 ##
 # end of netfilter
 
-
 ### net software
 %if %{with imq}
 %patch70 -p1
@@ -1151,6 +1148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.173  2008-04-08 23:32:33  zbyniu
+- cleanup
+
 Revision 1.172  2008-04-08 23:20:45  glen
 - updated most of the patches from kernel:LINUX_2_6 branch
 - update ck patch
================================================================

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



More information about the pld-cvs-commit mailing list