SPECS: ians.spec - new bcond, typos, adapterized

glen glen at pld-linux.org
Thu Feb 9 21:38:44 CET 2006


Author: glen                         Date: Thu Feb  9 20:38:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new bcond, typos, adapterized

---- Files affected:
SPECS:
   ians.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/ians.spec
diff -u SPECS/ians.spec:1.57 SPECS/ians.spec:1.58
--- SPECS/ians.spec:1.57	Thu Feb  9 21:30:16 2006
+++ SPECS/ians.spec	Thu Feb  9 21:38:38 2006
@@ -1,30 +1,27 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_dist_kernel - without distribution kernel
+%bcond_without	dist_kernel		# without distribution kernel
 #
-
 %define         _kernelsrcdir           /usr/src/linux-2.4
-
+%define	_rel	1
 Summary:	IANS utility for Intel(R) PRO/100
 Summary(pl):	Narzędzie IANS do karty Intel(R) PRO/100
 Name:		ians
 Version:	3.4.3a
-%define	_rel	1
 Release:	%{_rel}
-Group:		Base/Kernel
 License:	BSD (see LICENSE_BINARY)
-Vendor:		Intel Corporation
-Source0:	ftp://aiedownload.intel.com/df-support/5600/eng/ians-%{version}.tar.gz
+Group:		Base/Kernel
+Source0:	ftp://aiedownload.intel.com/df-support/5600/eng/%{name}-%{version}.tar.gz
 # Source0-md5:	6030f3ef19cf0e04cb9c83ecdca50c39
 URL:		http://support.intel.com/support/network/adapter/pro100/
-%{!?_without_dist_kernel:BuildRequires:	kernel24-source > 2.4.0}
 BuildRequires:	%{kgcc_package}
+%{?without_dist_kernel:BuildRequires:	kernel24-source >= 2.4.0}
 BuildRequires:	rpmbuild(macros) >= 1.118
+%{?without_dist_kernel:Requires:	kernel(ians) = %{version}}
+Conflicts:	kernel >= 2.6.0
 ExclusiveArch:	%{ix86}
-%{!?_without_dist_kernel:Requires:	kernel(ians) = %{version}}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conficts:	kernel > 2.6.0
 
 %define		_sysconfdir	/etc/ians
 
@@ -44,12 +41,12 @@
 Summary(pl):	Moduł IANS do karty Intel(R) PRO/100
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{!?without_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Requires:	ians = %{version}
 Provides:	kernel(ians) = %{version}
-Obsoletes:	linux-smp-net-ians
 Obsoletes:	kernel-net-ians
+Obsoletes:	linux-smp-net-ians
 
 %description -n kernel24-net-ians
 This package contains module ians.o which allows you to use advanced
@@ -65,12 +62,12 @@
 Summary(pl):	Moduł SMP IANS do karty Intel(R) PRO/100
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{!?without_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Requires:	ians = %{version}
 Provides:	kernel(ians) = %{version}
-Obsoletes:	linux-net-ians
 Obsoletes:	kernel-smp-net-ians
+Obsoletes:	linux-net-ians
 
 %description -n kernel24-smp-net-ians
 This package contains module ians.o (for SMP systems) which allows you
@@ -108,7 +105,7 @@
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
 
 %{__make} install -C src \
-	MAN_DIR=/usr/share/man \
+	MAN_DIR=%{_mandir} \
 	BIN_DIR=/sbin \
 	INSTALL_ROOT=$RPM_BUILD_ROOT \
 	CC="%{kgcc}" \
@@ -153,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2006/02/09 20:38:38  glen
+- new bcond, typos, adapterized
+
 Revision 1.57  2006/02/09 20:30:16  marcus
 - it is for 2.4 only, changed names kernel subpackages
 
@@ -184,7 +184,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.47  2003/05/16 08:33:42  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.46  2003/05/14 14:42:43  qboosh
 - added depmod options so modules can be installed for kernel other than running
@@ -252,19 +252,19 @@
 - 1.7.17 (as usually no info about changes...)
 - removed not needed now patches
 - new doc
-STBR
+  STBR
 
 Revision 1.25  2002/05/22 20:35:37  blues
 - fix location of ians modules (misc not main directory with modules)
 
 Revision 1.24  2002/04/25 16:35:02  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.23  2002/04/25 10:50:33  blues
 - 1.6.30a
 
 Revision 1.22  2002/03/27 11:45:58  roman
-s/BSD, see LICENSE_BINARY/BSD (see LICENSE_BINARY) in License
+- s/BSD, see LICENSE_BINARY/BSD (see LICENSE_BINARY) in License
 
 Revision 1.21  2002/03/17 16:06:25  dzimi
 - update release numbers to build with new kernel release
@@ -295,7 +295,7 @@
 
 Revision 1.14  2002/02/22 22:19:25  blues
 - 1.6.20b (fixes unknown... Intel isn't kind to inform about this detail...)
-STB
+  STB
 
 Revision 1.13  2002/02/10 19:11:01  marcus
 - rel. 4. (for build with 2.2.20-10 and 2.4)
@@ -309,12 +309,12 @@
 - separate kernel module from aplications...
 
 Revision 1.10  2002/01/18 02:13:18  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.9  2002/01/17 12:50:05  blues
 - 1.5.18c
 - small fix in files
-NOTE: could someone read the license? I don't understand anything...
+  NOTE: could someone read the license? I don't understand anything...
 
 Revision 1.8  2002/01/09 00:12:08  blues
 - URL updated
@@ -328,16 +328,16 @@
 - some cosmetics
 - more docs
 - marked /etc/ians/ians.conf as ghost
-STBR
+  STBR
 
 Revision 1.5  2001/11/05 20:29:02  blues
 - 1.4.27
 - makefile patch renamed and updated
-STB
+- STB
 
 Revision 1.4  2001/10/16 13:58:07  qboosh
 - added empty base package to remove junk from .src.rpm name
-- use kernel%%{smpstr}-*-* naming scheme
+- use kernel%{smpstr}-*-* naming scheme
 - release 2
 
 Revision 1.3  2001/09/21 22:06:43  blues
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ians.spec?r1=1.57&r2=1.58&f=u



More information about the pld-cvs-commit mailing list