Author: pluto Date: Fri Mar 16 10:58:48 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- build updated for new kernel layout.
---- Files affected:
SPECS:
madwifi-ng.spec (1.45 -> 1.46)
---- Diffs:
================================================================
Index: SPECS/madwifi-ng.spec
diff -u SPECS/madwifi-ng.spec:1.45 SPECS/madwifi-ng.spec:1.46
--- SPECS/madwifi-ng.spec:1.45 Thu Mar 15 00:44:51 2007
+++ SPECS/madwifi-ng.spec Fri Mar 16 11:58:42 2007
@@ -5,8 +5,6 @@
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
-%bcond_without up # don't build UP module
-%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
#
@@ -15,7 +13,7 @@
%define snap_day 25
%define snap %{snap_year}%{snap_month}%{snap_day}
%define snapdate %{snap_year}-%{snap_month}-%{snap_day}
-%define _rel 0.%{snap}.2
+%define _rel 0.%{snap}.3
%define trunk r2156
Summary: Atheros WiFi card driver
Summary(pl.UTF-8): Sterownik karty radiowej Atheros
@@ -38,7 +36,7 @@
URL: http://www.madwifi.org/
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.333
+BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sharutils
%endif
ExclusiveArch: alpha arm %{ix86} %{x8664} mips powerpc ppc sparc sparcv9
sparc64 xscale
@@ -67,8 +65,6 @@
%description devel -l pl.UTF-8
Pliki nagłówkowe dla madwifi.
-# kernel subpackages.
-
%package -n kernel%{_alt_kernel}-net-madwifi-ng
Summary: Linux driver for Atheros cards
Summary(pl.UTF-8): Sterownik dla Linuksa do kart Atheros
@@ -76,8 +72,9 @@
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+Obsoletes: kernel-smp-net-madwifi-ng
%endif
%description -n kernel%{_alt_kernel}-net-madwifi-ng
@@ -90,27 +87,6 @@
Ten pakiet zawiera moduł jądra Linuksa.
-%package -n kernel%{_alt_kernel}-smp-net-madwifi-ng
-Summary: Linux SMP driver for %{name} cards
-Summary(pl.UTF-8): Sterownik dla Linuksa SMP do kart %{name}
-Release: [EMAIL PROTECTED]
-Group: Base/Kernel
-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-net-madwifi-ng
-This is driver for Atheros cards for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-net-madwifi-ng -l pl.UTF-8
-Sterownik dla Linuksa do kart Atheros.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
%prep
%setup -q -n %{name}-%{trunk}-%{snap}
# airckrack-ng
@@ -125,7 +101,7 @@
%{__make} -C tools \
CC="%{__cc}" \
CFLAGS="%{rpmcflags}" \
- KERNELCONF="%{_kernelsrcdir}/config-%{?with_up:up}%{?with_smp:smp}"
+
KERNELCONF="%{_kernelsrcdir}/config-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}"
%endif
%if %{with kernel}
@@ -164,7 +140,7 @@
%{__make} install-tools \
TARGET=%{target} \
- KERNELCONF="%{_kernelsrcdir}/config-%{?with_up:up}%{?with_smp:smp}" \
+
KERNELCONF="%{_kernelsrcdir}/config-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}"
\
KERNELPATH="%{_kernelsrcdir}" \
DESTDIR=$RPM_BUILD_ROOT \
BINDIR=%{_bindir} \
@@ -190,12 +166,6 @@
%postun -n kernel%{_alt_kernel}-net-madwifi-ng
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-net-madwifi-ng
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-madwifi-ng
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -209,25 +179,20 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-net-madwifi-ng
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/net/*.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-madwifi-ng
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/net/*.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2007/03/16 10:58:42 pluto
+- build updated for new kernel layout.
+
Revision 1.45 2007/03/14 23:44:51 pluto
- use correct up/smp config.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/madwifi-ng.spec?r1=1.45&r2=1.46&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
