SPECS (AC-branch): e1000.spec - merge 7.6.15.5 from LINUX_2_6_22 branch, ol...

glen glen at pld-linux.org
Thu Jul 3 12:28:59 CEST 2008 

Author: glen                         Date: Thu Jul  3 10:28:59 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge 7.6.15.5 from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch

---- Files affected:
SPECS:
   e1000.spec (1.58.2.12 -> 1.58.2.13) 

---- Diffs:

================================================================
Index: SPECS/e1000.spec
diff -u SPECS/e1000.spec:1.58.2.12 SPECS/e1000.spec:1.58.2.13
--- SPECS/e1000.spec:1.58.2.12	Wed Nov 28 01:26:06 2007
+++ SPECS/e1000.spec	Thu Jul  3 12:28:54 2008
@@ -3,10 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%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,81 +12,52 @@
 %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	3
+%define		rel	1
 %define		pname	e1000
 Summary:	Intel(R) PRO/1000 driver for Linux
-Summary(pl):	Sterownik do karty Intel(R) PRO/1000
+Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
 Name:		%{pname}%{_alt_kernel}
-Version:	7.6.12
-Release:	%{_rel}
+Version:	7.6.15.5
+Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5:	e3a54d3a2862b378eeddfa2ce6298cae
+# Source0-md5:	744d801c29a3c67713228aea96e17c86
 URL:		http://sourceforge.net/projects/e1000/
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
-# gcc fails on AC
-ExcludeArch:	ppc
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.379
+# gcc fails on ac-ppc, ac-sparc has no enable/disable_irq symbols
+ExcludeArch:	ppc sparc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This package contains the Linux driver for the Intel(R) PRO/1000
 family of 10/100/1000 Ethernet network adapters.
 
-%description -l pl
+%description -l pl.UTF-8
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %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:	%{_rel}@%{_kernel_ver_str}
+Summary:	Intel(R) PRO/1000 driver for Linux
+Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
-%endif
-Provides:	kernel(e1000)
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
 
 %description -n kernel%{_alt_kernel}-net-e1000
-This package contains the Linux SMP driver for the Intel(R) PRO/1000
-family of 10/100/1000 Ethernet network adapters.
-
-%description -n kernel%{_alt_kernel}-net-e1000 -l pl
-Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
-10/100/1000Mbit z rodziny Intel(R) PRO/1000.
-
-%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:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-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
-
-%description -n kernel%{_alt_kernel}-smp-net-e1000
-This package contains the Linux SMP driver for the Intel(R) PRO/1000
+This package contains the Linux driver for the Intel(R) PRO/1000
 family of 10/100/1000 Ethernet network adapters.
 
-%description -n kernel%{_alt_kernel}-smp-net-e1000 -l pl
-Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
+%description -n kernel%{_alt_kernel}-net-e1000 -l pl.UTF-8
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep
@@ -99,6 +67,8 @@
 e1000-objs := e1000_main.o e1000_82540.o e1000_82542.o e1000_82571.o e1000_82541.o \
 e1000_82543.o e1000_ich8lan.o e1000_80003es2lan.o e1000_mac.o e1000_nvm.o e1000_phy.o \
 e1000_manage.o e1000_param.o e1000_ethtool.o kcompat.o e1000_api.o
+
+EXTRA_CFLAGS=-DDRIVER_E1000
 EOF
 
 %build
@@ -107,6 +77,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %install_kernel_modules -m src/%{pname} -d kernel/drivers/net -n %{pname} -s current
+# blacklist kernel module
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf <<'EOF'
+blacklist e1000
+alias e1000 e1000-current
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,29 +92,11 @@
 %postun	-n kernel%{_alt_kernel}-net-e1000
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-e1000
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-e1000
-%depmod %{_kernel_ver}smp
-
-%if %{with kernel}
-%if %{with up}
-%files -n kernel%{_alt_kernel}-net-e1000
+%files	-n kernel%{_alt_kernel}-net-e1000
 %defattr(644,root,root,755)
 %doc e1000.7 README
 /etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-e1000
-%defattr(644,root,root,755)
-%doc e1000.7 README
-/etc/modprobe.d/%{_kernel_ver}smp/%{pname}.conf
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/%{pname}*.ko*
-%endif
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -147,44 +104,99 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.58.2.12  2007/11/28 00:26:06  glen
-- rel 3
+Revision 1.58.2.13  2008/07/03 10:28:54  glen
+- merge 7.6.15.5 from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
+
+Revision 1.85.2.2  2008-04-04 19:03:28  glen
+- disable failing archs
+
+Revision 1.85.2.1  2008-04-04 18:57:34  glen
+- ac macros
+
+Revision 1.85  2008-04-04 18:56:40  glen
+- merge fixes from AC-branch
+
+Revision 1.84  2008-03-28 08:14:12  hawk
+- updated to 7.6.15.5
+
+Revision 1.83  2008-03-09 11:26:47  shadzik
+- blacklist old e1000 module from kernel source
+- rel 2
+
+Revision 1.82  2008-03-02 18:56:50  hawk
+- killed underscore insanity, cosmetics
+
+Revision 1.81  2008-02-29 08:54:14  hawk
+- updated to 7.6.15.4
+
+Revision 1.80  2008-02-12 09:41:07  hawk
+- release 4
+
+Revision 1.79  2008-02-08 08:51:45  hawk
+- release 3
+
+Revision 1.78  2008-02-03 07:39:36  hawk
+- release 2
+
+Revision 1.77  2008-02-01 20:51:18  zbyniu
+- up to 7.6.15; builds on kernel-*-2.6.22 and .24
 
-Revision 1.58.2.11  2007-11-27 16:40:21  glen
-- no smp kernel on ac-sparc; rel 2
+Revision 1.76  2008-01-23 17:32:04  hawk
+- suffix src package with alt kernel name (if present)
 
-Revision 1.58.2.10  2007-11-27 13:19:20  glen
-- add support for alt kernel
+Revision 1.75  2007-12-17 23:43:57  shadzik
+- summary ut8
 
-Revision 1.58.2.9  2007-11-27 01:23:11  shadzik
+Revision 1.74  2007-12-09 22:43:45  areq
+- rel 2
+
+Revision 1.73  2007-11-27 23:00:40  glen
+- keep src.rpm without kernel ver (update from AC-branch), cvs cp pending
+
+Revision 1.72  2007-11-27 01:18:18  shadzik
 - 7.6.12
 
-Revision 1.58.2.8  2007-08-24 16:40:49  shadzik
-- 7.6.5
+Revision 1.71  2007-10-18 19:19:46  adamg
+- updated to 7.6.9.1
+
+Revision 1.70  2007/08/24 16:34:40  shadzik
 - define _mod_name
 
-Revision 1.58.2.7  2007/04/26 23:48:08  shadzik
+Revision 1.69  2007/08/24 16:30:03  shadzik
+- 7.6.5
+
+Revision 1.68  2007/04/26 23:44:00  shadzik
 - up to 7.5.5
 
-Revision 1.58.2.6  2007/04/08 12:26:31  shadzik
-- new URL
+Revision 1.67  2007/04/09 00:22:12  shadzik
+- proper rpm macros are not enough, you need also a proper kernel (updated kernel-module-build version)
 
-Revision 1.58.2.5  2007/03/26 18:59:53  shadzik
-- fix build when --without up passed
+Revision 1.66  2007/04/08 12:24:25  shadzik
+- new URL
 
-Revision 1.58.2.4  2007/03/25 03:38:34  shadzik
-- up to 7.4.35
+Revision 1.65  2007/03/25 03:52:02  shadzik
+- cleanup
 
-Revision 1.58.2.3  2007/03/25 03:36:57  shadzik
-- fix build by adding 'up' bcond
+Revision 1.64  2007/03/24 21:11:31  shadzik
+- 7.4.35
+- new kernel macros
+- remove obsolete smp support
 
-Revision 1.58.2.2  2007/03/01 02:18:39  shadzik
+Revision 1.63  2007/03/01 01:29:25  shadzik
 - 7.4.27
-- new Source0
 
-Revision 1.58.2.1  2006/12/07 20:23:35  glen
-- exclude ppc due gcc bug, but i want this pkg appear in AC
-- rel 3
+Revision 1.62  2007/03/01 01:12:11  shadzik
+- up to 7.3.20
+
+Revision 1.61  2007/02/27 16:52:59  sparky
+- without up bcond
+- fixed %files for smp-only
+
+Revision 1.60  2007/02/13 08:06:37  glen
+- tabs in preamble
+
+Revision 1.59  2007/02/12 00:49:00  baggins
+- converted to UTF-8
 
 Revision 1.58  2006/11/28 17:59:24  glen
 - add per package modprobe file so one could keep using e1000 in their modprobe.conf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e1000.spec?r1=1.58.2.12&r2=1.58.2.13&f=u

More information about the pld-cvs-commit mailing list