packages: igb/igb.spec - HEAD iS HEAD !

[marcus]

Author: marcus                       Date: Fri Jan 28 15:15:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- HEAD iS HEAD !

---- Files affected:
packages/igb:
   igb.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/igb/igb.spec
diff -u packages/igb/igb.spec:1.56 packages/igb/igb.spec:1.57
--- packages/igb/igb.spec:1.56	Fri Jan 28 16:11:32 2011
+++ packages/igb/igb.spec	Fri Jan 28 16:15:13 2011
@@ -1,13 +1,11 @@
 # $Revision$, $Date$
 # 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_without	dist_kernel	# allow non-distribution kernel
+%bcond_without	kernel		# don't build kernel modules
+%bcond_with	verbose		# verbose build (V=1)
 
 %ifarch sparc
-%undefine       with_smp
+%undefine	with_smp
 %endif
 
 %if %{without kernel}
@@ -29,7 +27,7 @@
 Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5:	32d898732dce0f0ea4d94f068ab59608
 URL:		http://sourceforge.net/projects/e1000/
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.10}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,25 +58,6 @@
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny
 Intel(R) PRO/1000 opartych o układy 82575EB/GB lub 82576.
 
-%package -n kernel%{_alt_kernel}-smp-net-igb
-Summary:	Intel(R) PRO/1000 driver for Linux SMP
-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
-Requires(postun):	%releq_kernel
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-net-igb
-This package contains the Linux driver for the Intel(R) PRO/1000
-adapters with 82575EB/GB or 82576 chipsets.
-
-%description -n kernel%{_alt_kernel}-smp-net-igb -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny
-Intel(R) PRO/1000 opartych o układy 82575EB/GB lub 82576.
-
 %prep
 %setup -q -n %{pname}-%{version}
 cat > src/Makefile <<'EOF'
@@ -114,32 +93,15 @@
 %post	-n kernel%{_alt_kernel}-net-igb
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-igb
-%depmod %{_kernel_ver}
-
 %postun	-n kernel%{_alt_kernel}-net-igb
 %depmod %{_kernel_ver}
 
-%postun	-n kernel%{_alt_kernel}-smp-net-igb
-%depmod %{_kernel_ver}
-
-%if %{with up}
 %files	-n kernel%{_alt_kernel}-net-igb
 %defattr(644,root,root,755)
 %doc README
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*
 %{_mandir}/man7/igb.7*
-%endif
-
-%if %{with smp}
-%files	-n kernel%{_alt_kernel}-smp-net-igb
-%defattr(644,root,root,755)
-%doc README
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/%{pname}*.ko*
-%{_mandir}/man7/igb.7*
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -147,8 +109,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.56  2011/01/28 15:11:32  marcus
-- igb module for Ac 2.6.16
+Revision 1.57  2011/01/28 15:15:13  marcus
+- HEAD iS HEAD !
 
 Revision 1.55  2010/12/27 21:37:38  gotar
 - upgraded to 2.4.12, moved man page to it's place, %config and %verify flags
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/igb/igb.spec?r1=1.56&r2=1.57&f=u