Author: glen Date: Tue Jan 29 18:14:46 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- remove version macros, only in one place they are in use
---- Files affected:
SPECS:
kernel-vanilla.spec (1.78 -> 1.79)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.78 SPECS/kernel-vanilla.spec:1.79
--- SPECS/kernel-vanilla.spec:1.78 Tue Jan 29 19:11:36 2008
+++ SPECS/kernel-vanilla.spec Tue Jan 29 19:14:41 2008
@@ -23,24 +23,6 @@
%define have_oss 1
%define have_sound 1
-## Program required by kernel to work.
-%define _binutils_ver 2.12.1
-%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 _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 alt_kernel vanilla
%define _basever 2.6.24
@@ -112,19 +94,19 @@
Provides: kernel-net-ipw2100 = 1.1.3
Provides: kernel-net-ipw2200 = 1.0.8
Provides: module-info
-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: 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: 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)
@@ -241,8 +223,8 @@
Requires: %{name}-up = %{epoch}:%{version}-%{release}
Provides: kernel(pcmcia)
Provides: kernel-pcmcia = %{pcmcia_version}
-Conflicts: pcmcia-cs < %{_pcmcia_cs_ver}
-Conflicts: pcmciautils < %{_pcmciautils_ver}
+Conflicts: pcmcia-cs < 3.1.21
+Conflicts: pcmciautils < 004
Autoreqprov: no
%description pcmcia
@@ -798,6 +780,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.79 2008-01-29 18:14:41 glen
+- remove version macros, only in one place they are in use
+
Revision 1.78 2008-01-29 18:11:36 glen
- skip build and source symlinks from packaging
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.78&r2=1.79&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
