SPECS: kernel-desktop.spec - now that there's only main one packag...

[glen]

Author: glen                         Date: Sat Jan 19 17:35:43 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- now that there's only main one package, drop version macros

---- Files affected:
SPECS:
   kernel-desktop.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.148 SPECS/kernel-desktop.spec:1.149
--- SPECS/kernel-desktop.spec:1.148	Sat Jan 19 18:20:04 2008
+++ SPECS/kernel-desktop.spec	Sat Jan 19 18:35:38 2008
@@ -8,7 +8,7 @@
 # - check patches > 90
 # - put together a default .config that makes sense for desktops
 # - convert patches to common diff -uNp format
-# - make sure patch numbering is consistent and preapare it
+# - make sure patch numbering is consistent and prepare it
 #   for the future
 # - investigate ppc-ICE patches from kernel.spec (does it fix the e1000 ICE?)
 # - investigate pwc-uncompress patch from kernel.spec
@@ -22,7 +22,6 @@
 #
 # Conditional build:
 %bcond_without	source		# don't build kernel-source package
-
 %bcond_with	preemptrt	# use realtime-preempt patch
 %bcond_without	ck		# don't use Con Kolivas patchset
 %bcond_with	grsec_minimal	# don't build grsecurity (minimal subset: proc,link,fifo,shm)
@@ -39,7 +38,6 @@
 %define		with_fbsplash	1
 %endif
 
-
 %ifnarch %{ix86}
 %undefine	with_pae
 %endif
@@ -50,23 +48,6 @@
 %define		have_isa	0
 %endif
 
-## Program required by kernel to work.
-%define		_util_linux_ver		2.10o
-%define		_module_init_tool_ver	0.9.10
-%define		_e2fsprogs_ver		1.29
-%define		_jfsutils_ver		1.1.3
-%define		_reiserfsprogs_ver	3.6.3
-%define		_reiser4progs_ver	1.0.0
-%define		_xfsprogs_ver		2.6.0
-%define		_pcmcia_cs_ver		3.1.21
-%define		_pcmciautils_ver	004
-%define		_quota_tools_ver	3.09
-%define		_ppp_ver		1:2.4.0
-%define		_isdn4k_utils_ver	3.1pre1
-%define		_nfs_utils_ver		1.0.5
-%define		_procps_ver		3.2.0
-%define		_oprofile_ver		0.9
-%define		_udev_ver		071
 %define		netfilter_snap		20061213
 
 %define		_enable_debug_packages			0
@@ -269,20 +250,20 @@
 %{?with_fbsplash:Suggests:	splashutils}
 Provides:	kernel(netfilter) = %{netfilter_snap}
 Provides:	%{name}(netfilter) = %{netfilter_snap}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	oprofile < %{_oprofile_ver}
-Conflicts:	ppp < %{_ppp_ver}
-Conflicts:	procps < %{_procps_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
-Conflicts:	reiser4progs < %{_reiser4progs_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	udev < %{_udev_ver}
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
+Conflicts:	e2fsprogs < 1.29
+Conflicts:	isdn4k-utils < 3.1pre1
+Conflicts:	jfsutils < 1.1.3
+Conflicts:	module-init-tool < 0.9.10
+Conflicts:	nfs-utils < 1.0.5
+Conflicts:	oprofile < 0.9
+Conflicts:	ppp < 1:2.4.0
+Conflicts:	procps < 3.2.0
+Conflicts:	quota-tools < 3.09
+Conflicts:	reiser4progs < 1.0.0
+Conflicts:	reiserfsprogs < 3.6.3
+Conflicts:	udev < 071
+Conflicts:	util-linux < 2.10o
+Conflicts:	xfsprogs < 2.6.0
 ExclusiveArch:	%{ix86} %{x8664} ppc
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -393,8 +374,8 @@
 Summary(pl.UTF-8):	Moduły PCMCIA
 Group:		Base/Kernel
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
-Conflicts:	pcmciautils < %{_pcmciautils_ver}
+Conflicts:	pcmcia-cs < 3.1.21
+Conflicts:	pcmciautils < 004
 Autoreqprov:	no
 
 %description pcmcia
@@ -1084,6 +1065,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2008-01-19 17:35:38  glen
+- now that there's only main one package, drop version macros
+
 Revision 1.148  2008-01-19 17:20:04  glen
 - use %{name} macro
 
================================================================

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