Author: rotom Date: Fri Mar 23 10:13:02 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - update rpmbuild(macros) - remove smp stuff
---- Files affected: SPECS: ipw3945.spec (1.31 -> 1.32) ---- Diffs: ================================================================ Index: SPECS/ipw3945.spec diff -u SPECS/ipw3945.spec:1.31 SPECS/ipw3945.spec:1.32 --- SPECS/ipw3945.spec:1.31 Sun Feb 25 14:04:09 2007 +++ SPECS/ipw3945.spec Fri Mar 23 11:12:57 2007 @@ -2,8 +2,6 @@ # # Conditional build: %bcond_without dist_kernel # allow non-distribution kernel -%bcond_without up # don't build UP module -%bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) # %define _rel 1 @@ -26,7 +24,7 @@ URL: http://ipw3945.sourceforge.net/ #BuildRequires: ieee80211-devel = %{_ieeever} %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7} -BuildRequires: rpmbuild(macros) >= 1.330 +BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 Requires: ipw3945-firmware = %{_fwver} Requires: ipw3945d @@ -52,7 +50,7 @@ Release: [EMAIL PROTECTED] Group: Base/Kernel %(rpm -q --qf 'Requires: kernel%{_alt_kernel}-net-ieee80211 = %%{epoch}:%%{version}-%%{release}\n' ieee80211-devel | sed -e 's/ (none):/ /' | grep -v "is not") -%{?with_dist_kernel:%requires_releq_kernel_up} +%{?with_dist_kernel:%requires_releq_kernel} Requires(post,postun): /sbin/depmod Requires: module-init-tools >= 3.2.2-2 Provides: %{name} @@ -69,31 +67,6 @@ Ten pakiet zawiera sterowniki jądra Linuksa dla kart Intel(R) PRO/Wireless 3945. -%package -n kernel%{_alt_kernel}-smp-net-%{name} -Summary: Linux SMP kernel module for the Intel(R) PRO/Wireless 3945 -Summary(de.UTF-8): Linux SMP Kernel Modul für Intel(R) PRO/Wireless 3945 Netzwerkkarten -Summary(pl.UTF-8): Moduł jądra Linuksa SMP dla kart Intel(R) PRO/Wireless 3945 -Release: [EMAIL PROTECTED] -Group: Base/Kernel -Requires: ipw3945-firmware = %{_fwver} -%(rpm -q --qf 'Requires: kernel%{_alt_kernel}-smp-net-ieee80211 = %%{epoch}:%%{version}-%%{release}\n' ieee80211-devel | sed -e 's/ (none):/ /' | grep -v "is not") -%{?with_dist_kernel:%requires_releq_kernel_smp} -Requires(post,postun): /sbin/depmod -Requires: module-init-tools >= 3.2.2-2 -Provides: %{name} - -%description -n kernel%{_alt_kernel}-smp-net-%{name} -This package contains Linux SMP kernel drivers for the Intel(R) -PRO/Wireless 3945. - -%description -n kernel%{_alt_kernel}-smp-net-%{name} -l de.UTF-8 -Dieses Paket enthält Linux SMP Kernel Treiber für Intel(R) -PRO/Wireless 3945 Netzwerkkarten. - -%description -n kernel%{_alt_kernel}-smp-net-%{name} -l pl.UTF-8 -Ten pakiet zawiera sterowniki jądra Linuksa SMP dla kart Intel(R) -PRO/Wireless 3945. - %prep %setup -q %patch0 -p1 @@ -117,32 +90,23 @@ %postun -n kernel%{_alt_kernel}-net-%{name} %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-smp-net-%{name} -%depmod %{_kernel_ver}smp - -%postun -n kernel%{_alt_kernel}-smp-net-%{name} -%depmod %{_kernel_ver}smp - -%if %{with up} || %{without dist_kernel} +%if %{with dist_kernel} %files -n kernel%{_alt_kernel}-net-%{name} %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/ipw3945-%{_mod_suffix}.ko* %{_sysconfdir}/modprobe.d/%{_kernel_ver}/ipw3945.conf %endif -%if %{with smp} && %{with dist_kernel} -%files -n kernel%{_alt_kernel}-smp-net-%{name} -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/misc/ipw3945-%{_mod_suffix}.ko* -%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/ipw3945.conf -%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.32 2007/03/23 10:12:57 rotom +- update rpmbuild(macros) +- remove smp stuff + Revision 1.31 2007/02/25 13:04:09 vip - ipw3945 won't work without the ipw3945d daemon ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ipw3945.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
