Author: glen Date: Sat Jan 19 17:47:01 2008 GMT
Module: SPECS Tag: LINUX_2_6_22
---- Log message:
- now that there's only main one package, drop version macros, cleanups
---- Files affected:
SPECS:
kernel.spec (1.441.2.1796.2.43 -> 1.441.2.1796.2.44)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.43 SPECS/kernel.spec:1.441.2.1796.2.44
--- SPECS/kernel.spec:1.441.2.1796.2.43 Sat Jan 19 18:21:53 2008
+++ SPECS/kernel.spec Sat Jan 19 18:46:55 2008
@@ -99,26 +99,6 @@
%define have_oss 0
%endif
-## 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 _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 _mkvmlinuz_ver 1.3
-
%define _basever 2.6.22
%define _postver .16
%define _prepatch %{nil}
@@ -127,17 +107,11 @@
%define _rel 4
%define subname
%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
-%define netfilter_snap 20070806
-
%define _enable_debug_packages 0
-%define no_install_post_strip 1
-%define no_install_post_chrpath 1
-
-%define drm_xfree_version 4.3.0
%define squashfs_version 3.2
%define suspend_version 2.2.10
-
+%define netfilter_snap 20070806
%define xen_version 3.0.2
Summary: The Linux kernel (the core of the Linux operating system)
@@ -445,23 +419,23 @@
Obsoletes: kernel-net-hostap
Obsoletes: kernel-net-ieee80211
Obsoletes: kernel-net-ipp2p
-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: vserver-packages
+Conflicts: e2fsprogs < 1.29
+Conflicts: isdn4k-utils < 3.1pre1
+Conflicts: jfsutils < 1.1.3
+Conflicts: module-init-tools < 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
%if %{with reiserfs4}
-Conflicts: reiser4progs < %{_reiser4progs_ver}
+Conflicts: reiser4progs < 1.0.0
%endif
-Conflicts: reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts: udev < %{_udev_ver}
-Conflicts: util-linux < %{_util_linux_ver}
-Conflicts: vserver-packages
-Conflicts: xfsprogs < %{_xfsprogs_ver}
+Conflicts: reiserfsprogs < 3.6.3
+Conflicts: udev < 071
+Conflicts: util-linux < 2.10o
+Conflicts: xfsprogs < 2.6.0
%if %{with xen0} || %{with xenU}
ExclusiveArch: %{ix86}
%else
@@ -599,10 +573,10 @@
Autoreqprov: no
%description drm
-DRM kernel modules (%{drm_xfree_version}).
+DRM kernel modules.
%description drm -l pl.UTF-8
-Sterowniki DRM (%{drm_xfree_version}).
+Sterowniki DRM.
%package pcmcia
Summary: PCMCIA modules
@@ -626,7 +600,7 @@
Summary(pl.UTF-8): Biblioteki do przygotowania bootowalnego jÄ
dra dla
PowerPC
Group: Base/Kernel
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: mkvmlinuz >= %{_mkvmlinuz_ver}
+Requires: mkvmlinuz >= 1.3
Obsoletes: kernel-smp-libs
Autoreqprov: no
@@ -1726,6 +1700,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1796.2.44 2008-01-19 17:46:55 glen
+- now that there's only main one package, drop version macros, cleanups
+
Revision 1.441.2.1796.2.43 2008-01-19 17:21:53 glen
- use %{name} macro
- LINUX_2_6_16 merges
@@ -1759,7 +1736,7 @@
of normal and grsecurity kernel (there was conflict on
/lib/modules/%{version}-%{release})
- release 3 to rebuild, but keep in mind that previous release was not
- integer due to adding lustre support which is still NFY/not tested)
+ integer due to adding lustre support which is still NFY/not tested)
Revision 1.441.2.1796.2.35 2007-12-31 15:27:39 matkor
- Release 2.2. bconded lustre added.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.43&r2=1.441.2.1796.2.44&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
