Author: glen Date: Tue Nov 20 00:49:27 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- alt kernel macros
---- Files affected:
SPECS:
linux-wlan-ng.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/linux-wlan-ng.spec
diff -u SPECS/linux-wlan-ng.spec:1.46 SPECS/linux-wlan-ng.spec:1.47
--- SPECS/linux-wlan-ng.spec:1.46 Wed Mar 14 01:17:58 2007
+++ SPECS/linux-wlan-ng.spec Tue Nov 20 01:49:22 2007
@@ -1,5 +1,8 @@
# $Revision$, $Date$
#
+# TODO:
+# - check %%desc, R:, BR:, cflags
+#
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
@@ -7,10 +10,11 @@
%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
-#
-# TODO:
-# - check %%desc, R:, BR:, cflags
-#
+
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+
%define _rel 0.1
Summary: Wireless microwave network card services - new generation 11Mbit
Summary(pl.UTF-8): Obsługa mikrofalowych kart sieciowych - nowa generacja
11Mbit
@@ -27,8 +31,8 @@
Patch2: %{name}-init.patch
URL: http://www.linux-wlan.com/
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.268
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
+BuildRequires: rpmbuild(macros) >= 1.379
%endif
BuildRequires: sed >= 4.0
Requires(post,preun): /sbin/chkconfig
@@ -60,7 +64,7 @@
Pakiet linux-wlan-ng-pcmcia zawiera programy wspierające obsługę
mikrofalowych kart sieciowych PCMCIA.
-%package -n kernel-net-wlan-ng
+%package -n kernel%{_alt_kernel}-net-wlan-ng
Summary: Drivers for wireless microwave network cards
Summary(pl.UTF-8): Sterowniki mikrofalowych kart sieciowych
Release: [EMAIL PROTECTED]
@@ -71,14 +75,14 @@
Requires(postun): %releq_kernel_up
%endif
-%description -n kernel-net-wlan-ng
+%description -n kernel%{_alt_kernel}-net-wlan-ng
Drivers for microwave wirelless network cards.
-%description -n kernel-net-wlan-ng -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-net-wlan-ng -l pl.UTF-8
Pakiet zawiera sterowniki nowej generacji dla mikrofalowych kart
sieciowych.
-%package -n kernel-smp-net-wlan-ng
+%package -n kernel%{_alt_kernel}-smp-net-wlan-ng
Summary: Drivers for wireless microwave network cards
Summary(pl.UTF-8): Sterowniki mikrofalowych kart sieciowych
Release: [EMAIL PROTECTED]
@@ -89,14 +93,14 @@
Requires(postun): %releq_kernel_smp
%endif
-%description -n kernel-smp-net-wlan-ng
+%description -n kernel%{_alt_kernel}-smp-net-wlan-ng
Drivers for microwave wirelless network cards.
-%description -n kernel-smp-net-wlan-ng -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-smp-net-wlan-ng -l pl.UTF-8
Pakiet zawiera sterowniki nowej generacji dla mikrofalowych kart
sieciowych.
-%package -n kernel-net-wlan-ng-pcmcia
+%package -n kernel%{_alt_kernel}-net-wlan-ng-pcmcia
Summary: Drivers for PCMCIA wireless microwave network cards
Summary(pl.UTF-8): Sterowniki mikrofalowych kart sieciowych PCMCIA
Release: [EMAIL PROTECTED]
@@ -107,14 +111,14 @@
Requires(postun): %releq_kernel_up
%endif
-%description -n kernel-net-wlan-ng-pcmcia
+%description -n kernel%{_alt_kernel}-net-wlan-ng-pcmcia
Drivers for microwave wirelless PCMCIA network cards.
-%description -n kernel-net-wlan-ng-pcmcia -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-net-wlan-ng-pcmcia -l pl.UTF-8
Pakiet zawiera sterowniki nowej generacji dla mikrofalowych kart
sieciowych PCMCIA.
-%package -n kernel-smp-net-wlan-ng-pcmcia
+%package -n kernel%{_alt_kernel}-smp-net-wlan-ng-pcmcia
Summary: Drivers for PCMCIA wireless microwave network cards
Summary(pl.UTF-8): Sterowniki mikrofalowych kart sieciowych PCMCIA
Release: [EMAIL PROTECTED]
@@ -125,10 +129,10 @@
Requires(postun): %releq_kernel_smp
%endif
-%description -n kernel-smp-net-wlan-ng-pcmcia
+%description -n kernel%{_alt_kernel}-smp-net-wlan-ng-pcmcia
Drivers for microwave wirelless PCMCIA network cards.
-%description -n kernel-smp-net-wlan-ng-pcmcia -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-smp-net-wlan-ng-pcmcia -l pl.UTF-8
Pakiet zawiera sterowniki nowej generacji dla mikrofalowych kart
sieciowych PCMCIA.
@@ -245,28 +249,28 @@
%service pcmcia restart
fi
-%post -n kernel-net-wlan-ng
+%post -n kernel%{_alt_kernel}-net-wlan-ng
%depmod %{_kernel_ver}
-%postun -n kernel-net-wlan-ng
+%postun -n kernel%{_alt_kernel}-net-wlan-ng
%depmod %{_kernel_ver}
-%post -n kernel-smp-net-wlan-ng
+%post -n kernel%{_alt_kernel}-smp-net-wlan-ng
%depmod %{_kernel_ver}
-%postun -n kernel-smp-net-wlan-ng
+%postun -n kernel%{_alt_kernel}-smp-net-wlan-ng
%depmod %{_kernel_ver}
-%post -n kernel-net-wlan-ng-pcmcia
+%post -n kernel%{_alt_kernel}-net-wlan-ng-pcmcia
%depmod %{_kernel_ver}
-%postun -n kernel-net-wlan-ng-pcmcia
+%postun -n kernel%{_alt_kernel}-net-wlan-ng-pcmcia
%depmod %{_kernel_ver}
-%post -n kernel-smp-net-wlan-ng-pcmcia
+%post -n kernel%{_alt_kernel}-smp-net-wlan-ng-pcmcia
%depmod %{_kernel_ver}
-%postun -n kernel-smp-net-wlan-ng-pcmcia
+%postun -n kernel%{_alt_kernel}-smp-net-wlan-ng-pcmcia
%depmod %{_kernel_ver}
%if %{with userspace}
@@ -285,26 +289,26 @@
%if %{with kernel}
%if %{with up} || %{without dist_kernel}
-%files -n kernel-net-wlan-ng
+%files -n kernel%{_alt_kernel}-net-wlan-ng
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/p80211.ko*
/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/prism2_pci.ko*
/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/prism2_usb.ko*
-%files -n kernel-net-wlan-ng-pcmcia
+%files -n kernel%{_alt_kernel}-net-wlan-ng-pcmcia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/prism2_cs.ko*
/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/prism2_plx.ko*
%endif
%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-wlan-ng
+%files -n kernel%{_alt_kernel}-smp-net-wlan-ng
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/p80211.ko*
/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/prism2_pci.ko*
/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/prism2_usb.ko*
-%files -n kernel-smp-net-wlan-ng-pcmcia
+%files -n kernel%{_alt_kernel}-smp-net-wlan-ng-pcmcia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/prism2_cs.ko*
/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/prism2_plx.ko*
@@ -317,6 +321,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2007-11-20 00:49:22 glen
+- alt kernel macros
+
Revision 1.46 2007-03-14 00:17:58 glen
- up bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/linux-wlan-ng.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
