Author: glen Date: Fri Feb 15 01:29:43 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- use kernel vermagic in deps
---- Files affected:
SPECS:
X11-driver-firegl.spec (1.141.2.22 -> 1.141.2.23) ,
X11-driver-nvidia-legacy.spec (1.38.2.25 -> 1.38.2.26) ,
X11-driver-nvidia-legacy2.spec (1.1.2.28 -> 1.1.2.29) , eagle-usb.spec
(1.89.2.23 -> 1.89.2.24) , em8300.spec (1.49.2.25 -> 1.49.2.26) , ipp2p.spec
(1.52.2.22 -> 1.52.2.23) , kernel-net-e1000.spec (1.58.2.16 -> 1.58.2.17) ,
libfuse.spec (1.76.2.23 -> 1.76.2.24) , mvsata.spec (1.17.2.21 -> 1.17.2.22) ,
ndiswrapper.spec (1.37.2.27 -> 1.37.2.28) , p2p.spec (1.23.2.23 -> 1.23.2.24) ,
qemu.spec (1.85.2.34 -> 1.85.2.35) , rt2400.spec (1.48.2.21 -> 1.48.2.22) ,
shfs.spec (1.66.2.20 -> 1.66.2.21) , submount.spec (1.22.2.21 -> 1.22.2.22) ,
svgalib.spec (1.165.2.20 -> 1.165.2.21) , unionfs.spec (1.24.2.26 -> 1.24.2.27)
, zaptel.spec (1.75.2.36 -> 1.75.2.37) , zd1211.spec (1.28.4.23 -> 1.28.4.24)
---- Diffs:
================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.141.2.22
SPECS/X11-driver-firegl.spec:1.141.2.23
--- SPECS/X11-driver-firegl.spec:1.141.2.22 Tue Feb 12 12:01:10 2008
+++ SPECS/X11-driver-firegl.spec Fri Feb 15 02:29:33 2008
@@ -8,20 +8,7 @@
%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
%bcond_without incall # include all sources in srpm
-%bcond_with grsec_kernel # build for kernel-grsecurity
-%bcond_with desktop_kernel # build for kernel-desktop (disables UP and SMP)
-%if %{with kernel} && %{with dist_kernel}
-%if %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
-%if %{with desktop_kernel}
-%define alt_kernel desktop
-%define requires_releq_kernel_up %requires_releq_kernel
-%undefine with_up
-%undefine with_smp
-%endif
-%endif
%if %{without kernel}
%undefine with_dist_kernel
%endif
@@ -41,13 +28,12 @@
%define arch_dir x86_64
%endif
-%define _rel 61
%define pname X11-driver-firegl
Summary: Linux Drivers for ATI graphics accelerators
Summary(pl): Sterowniki do akcelerator�w graficznych ATI
Name: %{pname}%{_alt_kernel}
Version: 8.36.5
-Release: %{_rel}
+Release: 62
License: ATI Binary (parts are GPL)
Group: X11
Source0:
http://www2.ati.com/drivers/linux/ati-driver-installer-%{version}-x86.x86_64.run
@@ -99,10 +85,9 @@
%package -n kernel%{_alt_kernel}-video-firegl
Summary: ATI kernel module for FireGL support
Summary(pl): Modu� j�dra oferuj�cy wsparcie dla ATI FireGL
-Release: [EMAIL PROTECTED]
License: ATI
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
Provides: X11-driver-firegl(kernel)
@@ -115,10 +100,9 @@
%package -n kernel%{_alt_kernel}-smp-video-firegl
Summary: ATI kernel module for FireGL support
Summary(pl): Modu� j�dra oferuj�cy wsparcie dla ATI FireGL
-Release: [EMAIL PROTECTED]
License: ATI
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Requires(post,postun): /sbin/depmod
Provides: X11-driver-firegl(kernel)
@@ -267,6 +251,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.141.2.23 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.141.2.22 2008-02-12 11:01:10 glen
- release 61 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.38.2.25
SPECS/X11-driver-nvidia-legacy.spec:1.38.2.26
--- SPECS/X11-driver-nvidia-legacy.spec:1.38.2.25 Tue Feb 12 12:01:11 2008
+++ SPECS/X11-driver-nvidia-legacy.spec Fri Feb 15 02:29:33 2008
@@ -7,35 +7,29 @@
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-%define _nv_ver 71.86.01
%define _min_x11 6.7.0
#
%define oldname X11-driver-nvidia
%define pname X11-driver-nvidia-legacy
-%define _rel 61
Summary: Linux Drivers for nVidia TNT/TNT2/GF/old GF2/Quadro Chips
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old
GF2/Quadro
Name: %{pname}%{_alt_kernel}
-Version: %{_nv_ver}
-Release: %{_rel}
+Version: 71.86.01
+Release: 62
License: nVidia Binary
Group: X11
-Source0:
http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
+Source0:
http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
# Source0-md5: a4d0d1eb2841a59a4156122a1c08249a
-Source1:
http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg2.run
+Source1:
http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
# Source1-md5: bb273998a661ef5b481e5cd19cf64a3b
Source2: %{oldname}-settings.desktop
Source3: %{oldname}-xinitrc.sh
@@ -135,12 +129,10 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul f�r die nVidia-Architektur-Unterst�tzung
Summary(pl): Modu� j�dra dla obs�ugi kart graficznych nVidia
-Version: %{_nv_ver}
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
Obsoletes: kernel%{_alt_kernel}-video-nvidia < 1.0.7174
@@ -160,11 +152,10 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul f�r die nVidia-Architektur-Unterst�tzung
Summary(pl): Modu� j�dra dla obs�ugi kart graficznych nVidia
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
Obsoletes: kernel%{_alt_kernel}-smp-video-nvidia < 1.0.7174
@@ -182,13 +173,13 @@
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
%ifarch %{ix86}
/bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1
%else
/bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-pkg2
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg2
%endif
%patch0 -p1
%patch1 -p1
@@ -331,6 +322,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38.2.26 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.38.2.25 2008-02-12 11:01:11 glen
- release 61 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/X11-driver-nvidia-legacy2.spec
diff -u SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.28
SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.29
--- SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.28 Tue Feb 12 12:01:11 2008
+++ SPECS/X11-driver-nvidia-legacy2.spec Fri Feb 15 02:29:33 2008
@@ -7,42 +7,36 @@
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-%define _nv_ver 96.43.01
%define _min_x11 6.7.0
-%define _rel 61
#
%define pname X11-driver-nvidia-legacy2
Summary: Linux Drivers for NVIDIA GeForce/Quadro Chips
Summary(pl): Sterowniki do kart graficznych NVIDIA GeForce/Quadro
Name: %{pname}%{_alt_kernel}
-Version: %{_nv_ver}
-Release: %{_rel}
+Version: 96.43.01
+Release: 62
License: nVidia Binary
Group: X11
-Source0:
http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
+Source0:
http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
# Source0-md5: 66f8b5e243aad22162e40d0f05f0bf1e
-Source1:
http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1.run
+Source1:
http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg1.run
# Source1-md5: 1cb134675bbdce8e172a0edc78618ed3
Source2: %{pname}-settings.desktop
Source3: %{pname}-xinitrc.sh
Patch0: %{pname}-GL.patch
URL: http://www.nvidia.com/object/unix.html
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
BuildRequires: %{kgcc_package}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
BuildRequires: rpmbuild(macros) >= 1.330
%endif
BuildRequires: sed >= 4.0
@@ -130,12 +124,10 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul f�r die nVidia-Architektur-Unterst�tzung
Summary(pl): Modu� j�dra dla obs�ugi kart graficznych nVidia
-Version: %{_nv_ver}
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Provides: X11-driver-nvidia-legacy2(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -153,11 +145,10 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul f�r die nVidia-Architektur-Unterst�tzung
Summary(pl): Modu� j�dra dla obs�ugi kart graficznych nVidia
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Provides: X11-driver-nvidia-legacy2(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -173,13 +164,13 @@
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
%ifarch %{ix86}
/bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1
%else
/bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg1
%endif
%patch0 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
@@ -325,6 +316,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.1.2.29 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.1.2.28 2008-02-12 11:01:11 glen
- release 61 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/eagle-usb.spec
diff -u SPECS/eagle-usb.spec:1.89.2.23 SPECS/eagle-usb.spec:1.89.2.24
--- SPECS/eagle-usb.spec:1.89.2.23 Tue Feb 12 12:01:11 2008
+++ SPECS/eagle-usb.spec Fri Feb 15 02:29:33 2008
@@ -11,14 +11,10 @@
%bcond_without userspace # don't build userspace tools
%bcond_without cmvs
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
@@ -28,13 +24,12 @@
%undefine with_kernel
%endif
-%define _rel 61
%define pname eagle-usb
Summary: Linux driver for the Eagle 8051 Analog (sagem [EMAIL PROTECTED]
800/840/908/...) modems
Summary(pl): Sterownik dla Linuksa do modem�w Eagle 8051 Analog (sagem
[EMAIL PROTECTED] 800/840/908/...)
Name: %{pname}%{_alt_kernel}
Version: 2.3.3
-Release: %{_rel}
+Release: 62
License: GPL v2
Group: Base/Kernel
Source0:
http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{pname}-%{version}.tar.bz2
@@ -77,11 +72,9 @@
%package -n kernel%{_alt_kernel}-usb-eagle
Summary: Linux driver for the Eagle 8051 Analog (sagem [EMAIL PROTECTED]
800/840/908/...) modems
Summary(pl): Sterownik dla Linuksa do modem�w Eagle 8051 Analog (sagem
[EMAIL PROTECTED] 800/840/908/...)
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
-Provides: kernel-usb(eagle) = %{version}-%{_rel}
%if "%{_alt_kernel}" == "%{_nil}"
Obsoletes: kernel-usb-fast800
%endif
@@ -97,11 +90,9 @@
%package -n kernel%{_alt_kernel}-smp-usb-eagle
Summary: Linux SMP driver for the Eagle 8051 Analog (sagem [EMAIL
PROTECTED] 800/840/908/...) modems
Summary(pl): Sterownik dla Linuksa SMP do modem�w Eagle 8051 Analog (sagem
[EMAIL PROTECTED] 800/840/908/...)
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Requires(post,postun): /sbin/depmod
-Provides: kernel-usb(eagle) = %{version}-%{_rel}
%if "%{_alt_kernel}" == "%{_nil}"
Obsoletes: kernel-smp-usb-fast800
%endif
@@ -222,6 +213,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89.2.24 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.89.2.23 2008-02-12 11:01:11 glen
- release 61 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.49.2.25 SPECS/em8300.spec:1.49.2.26
--- SPECS/em8300.spec:1.49.2.25 Tue Feb 12 12:01:11 2008
+++ SPECS/em8300.spec Fri Feb 15 02:29:33 2008
@@ -9,14 +9,10 @@
%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%ifarch sparc
# kernel modules won't build on sparc32, no I2C in kernel
@@ -27,13 +23,12 @@
%undefine with_userspace
%endif
-%define _rel 61
%define pname em8300
Summary: DXR3 and H+ driver
Summary(pl): Sterowniki dla DXR3 i H+
Name: %{pname}%{_alt_kernel}
Version: 0.16.0
-Release: %{_rel}
+Release: 62
License: GPL
Group: Applications/System
Source0: http://dl.sourceforge.net/dxr3/%{pname}-%{version}.tar.gz
@@ -104,12 +99,8 @@
Summary: em8300 Linux kernel modules
Summary(pl): Modu�y j�dra Linuksa em8300
Group: Base/Kernel
-Release: [EMAIL PROTECTED]
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
-%endif
%description -n kernel%{_alt_kernel}-video-em8300
em8300 Linux kernel modules.
@@ -120,13 +111,9 @@
%package -n kernel%{_alt_kernel}-smp-video-em8300
Summary: em8300 Linux SMP kernel modules
Summary(pl): Modu�y j�dra Linuksa SMP em8300
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun): %releq_kernel_smp
-%endif
%description -n kernel%{_alt_kernel}-smp-video-em8300
em8300 Linux SMP kernel modules.
@@ -282,6 +269,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.49.2.26 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.49.2.25 2008-02-12 11:01:11 glen
- release 61 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.52.2.22 SPECS/ipp2p.spec:1.52.2.23
--- SPECS/ipp2p.spec:1.52.2.22 Tue Feb 12 12:01:11 2008
+++ SPECS/ipp2p.spec Fri Feb 15 02:29:33 2008
@@ -7,7 +7,6 @@
%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%ifarch sparc
%undefine with_smp
@@ -16,21 +15,17 @@
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-%define iptables_ver 1.3.3
-%define _rel 61
+%define iptables_ver 1.3.3
%define pname ipp2p
Summary: IPP2P - a netfilter extension to identify P2P filesharing
traffic
Summary(pl): IPP2P - rozszerzenie filtra pakiet�w identyfikuj�ce ruch P2P
Name: %{pname}%{_alt_kernel}
Version: 0.8.2
-Release: %{_rel}
+Release: 62
Epoch: 1
License: GPL
Group: Base/Kernel
@@ -72,9 +67,8 @@
%package -n kernel%{_alt_kernel}-net-ipp2p
Summary: IPP2P - a netfilter extension to identify P2P filesharing
traffic
Summary(pl): IPP2P - rozszerzenie filtra pakiet�w identyfikuj�ce ruch P2P
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
%description -n kernel%{_alt_kernel}-net-ipp2p
@@ -110,9 +104,8 @@
%package -n kernel%{_alt_kernel}-smp-net-ipp2p
Summary: IPP2P - a netfilter extension to identify P2P filesharing
traffic
Summary(pl): IPP2P - rozszerzenie filtra pakiet�w identyfikuj�ce ruch P2P
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Requires(post,postun): /sbin/depmod
%description -n kernel%{_alt_kernel}-smp-net-ipp2p
@@ -148,7 +141,6 @@
%package -n iptables-ipp2p
Summary: IPP2P - a netfilter extension to identify P2P filesharing
traffic
Summary(pl): IPP2P - rozszerzenie filtra pakiet�w identyfikuj�ce ruch P2P
-Release: %{_rel}
Group: Base/Kernel
Requires: iptables
@@ -251,6 +243,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.52.2.23 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.52.2.22 2008-02-12 11:01:11 glen
- release 61 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/kernel-net-e1000.spec
diff -u SPECS/kernel-net-e1000.spec:1.58.2.16
SPECS/kernel-net-e1000.spec:1.58.2.17
--- SPECS/kernel-net-e1000.spec:1.58.2.16 Tue Feb 12 12:01:21 2008
+++ SPECS/kernel-net-e1000.spec Fri Feb 15 02:29:33 2008
@@ -6,7 +6,6 @@
%bcond_without smp # don't build SMP module
%bcond_without up # don't build UP module
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%ifarch sparc
%undefine with_smp
@@ -15,20 +14,16 @@
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-%define _rel 7
%define pname e1000
Summary: Intel(R) PRO/1000 driver for Linux
Summary(pl): Sterownik do karty Intel(R) PRO/1000
Name: %{pname}%{_alt_kernel}
Version: 7.6.12
-Release: %{_rel}
+Release: 8
License: GPL v2
Group: Base/Kernel
Source0: http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
@@ -51,14 +46,9 @@
%package -n kernel%{_alt_kernel}-net-e1000
Summary: Intel(R) PRO/1000 driver for Linux SMP
Summary(pl): Sterownik do karty Intel(R) PRO/1000
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
-%endif
-Provides: kernel(e1000)
Obsoletes: e1000
Obsoletes: linux-net-e1000
@@ -73,14 +63,9 @@
%package -n kernel%{_alt_kernel}-smp-net-e1000
Summary: Intel(R) PRO/1000 driver for Linux SMP
Summary(pl): Sterownik do karty Intel(R) PRO/1000
-Release: [EMAIL PROTECTED]
Group: Base/Kernel
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun): %releq_kernel_smp
-%endif
-Provides: kernel(e1000)
Obsoletes: e1000
Obsoletes: linux-net-e1000
@@ -147,6 +132,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.58.2.17 2008-02-15 01:29:33 glen
+- use kernel vermagic in deps
+
Revision 1.58.2.16 2008-02-12 11:01:21 glen
- release 7 (kernel-2.6.16.60-4)
================================================================
Index: SPECS/libfuse.spec
diff -u SPECS/libfuse.spec:1.76.2.23 SPECS/libfuse.spec:1.76.2.24
--- SPECS/libfuse.spec:1.76.2.23 Tue Feb 12 12:01:11 2008
+++ SPECS/libfuse.spec Fri Feb 15 02:29:33 2008
@@ -7,7 +7,6 @@
%bcond_without up # without up packages
%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
%ifarch sparc
%undefine with_smp
@@ -16,20 +15,16 @@
%if %{without kernel}
%undefine with_dist_kernel
%endif
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-firegl.spec?r1=1.141.2.22&r2=1.141.2.23&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy.spec?r1=1.38.2.25&r2=1.38.2.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy2.spec?r1=1.1.2.28&r2=1.1.2.29&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eagle-usb.spec?r1=1.89.2.23&r2=1.89.2.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/em8300.spec?r1=1.49.2.25&r2=1.49.2.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.52.2.22&r2=1.52.2.23&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-net-e1000.spec?r1=1.58.2.16&r2=1.58.2.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libfuse.spec?r1=1.76.2.23&r2=1.76.2.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mvsata.spec?r1=1.17.2.21&r2=1.17.2.22&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ndiswrapper.spec?r1=1.37.2.27&r2=1.37.2.28&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/p2p.spec?r1=1.23.2.23&r2=1.23.2.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.85.2.34&r2=1.85.2.35&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rt2400.spec?r1=1.48.2.21&r2=1.48.2.22&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/shfs.spec?r1=1.66.2.20&r2=1.66.2.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/submount.spec?r1=1.22.2.21&r2=1.22.2.22&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/svgalib.spec?r1=1.165.2.20&r2=1.165.2.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unionfs.spec?r1=1.24.2.26&r2=1.24.2.27&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zaptel.spec?r1=1.75.2.36&r2=1.75.2.37&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zd1211.spec?r1=1.28.4.23&r2=1.28.4.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
