Author: hawk Date: Sat Apr 19 15:15:33 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- killed version macros
---- Files affected:
SPECS:
kernel-vanilla.spec (1.43.2.11.2.31 -> 1.43.2.11.2.32) ,
kernel-bare-grsecurity.spec (1.1.2.22 -> 1.1.2.23) , kernel-bare-vserver.spec
(1.1.2.21 -> 1.1.2.22)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.31
SPECS/kernel-vanilla.spec:1.43.2.11.2.32
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.31 Sat Apr 19 17:14:04 2008
+++ SPECS/kernel-vanilla.spec Sat Apr 19 17:15:27 2008
@@ -14,27 +14,8 @@
%define have_pcmcia 1
%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.25
@@ -97,19 +78,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 < 1:071
+Conflicts: util-linux < 2.10o
+Conflicts: xfsprogs < 2.6.0
ExclusiveArch: %{ix86} %{x8664}
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -220,8 +201,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
@@ -842,6 +823,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43.2.11.2.32 2008-04-19 15:15:27 hawk
+- killed version macros
+
Revision 1.43.2.11.2.31 2008-04-19 15:14:04 hawk
- started update to 2.6.25, NFY
================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.22
SPECS/kernel-bare-grsecurity.spec:1.1.2.23
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.22 Sat Apr 19 12:39:12 2008
+++ SPECS/kernel-bare-grsecurity.spec Sat Apr 19 17:15:27 2008
@@ -18,24 +18,6 @@
%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
-
%if %{with pax}
%define alt_kernel bare-pax-grsecurity
%else
@@ -111,19 +93,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 < 1:071
+Conflicts: util-linux < 2.10o
+Conflicts: xfsprogs < 2.6.0
ExclusiveArch: %{ix86} %{x8664}
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -234,8 +216,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
@@ -876,6 +858,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.23 2008-04-19 15:15:27 hawk
+- killed version macros
+
Revision 1.1.2.22 2008-04-19 10:39:12 hawk
- updated to 2.6.24.5
================================================================
Index: SPECS/kernel-bare-vserver.spec
diff -u SPECS/kernel-bare-vserver.spec:1.1.2.21
SPECS/kernel-bare-vserver.spec:1.1.2.22
--- SPECS/kernel-bare-vserver.spec:1.1.2.21 Sat Apr 19 17:06:08 2008
+++ SPECS/kernel-bare-vserver.spec Sat Apr 19 17:15:27 2008
@@ -14,27 +14,8 @@
%define have_pcmcia 1
%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 bare-vserver
%define _basever 2.6.24
@@ -107,19 +88,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 < 1:071
+Conflicts: util-linux < 2.10o
+Conflicts: xfsprogs < 2.6.0
ExclusiveArch: %{ix86} %{x8664}
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -229,8 +210,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
@@ -851,6 +832,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.22 2008-04-19 15:15:27 hawk
+- killed version macros
+
Revision 1.1.2.21 2008-04-19 15:06:08 hawk
updated linux-2.6-grsec-vs-minimal.patch for 2.6.24, release 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.43.2.11.2.31&r2=1.43.2.11.2.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-grsecurity.spec?r1=1.1.2.22&r2=1.1.2.23&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-vserver.spec?r1=1.1.2.21&r2=1.1.2.22&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
