- %{_alt_kernel} support

- use %build_kernel_modules, %install_kernel_modules macros

Changed files:
    acx.spec -> 1.57

diff --git a/acx.spec b/acx.spec
index a3cbb89c62f6706154fea77c129c68341dabcf70..b753e451b891558f96f215bf4af0035ff704b214 100644 (file)
--- a/acx.spec
+++ b/acx.spec
@@ -20,8 +20,8 @@ Group:                Base/Kernel
 Source0:       http://195.66.192.167/linux/acx_patches/%{name}-%{version}.tar.bz2
 # Source0-md5: 95bcd5df2365dfcfc78169b0331f69a2
 URL:           http://acx100.sourceforge.net/
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.16}
-BuildRequires: rpmbuild(macros) >= 1.286
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.16}
+BuildRequires: rpmbuild(macros) >= 1.326
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,7 +30,7 @@ This is driver for WLAN card based on ACX100 for Linux.
 %description -l pl
 Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100.
 
-%package -n kernel-net-acx100
+%package -n kernel%{_alt_kernel}-net-acx100
 Summary:       Linux driver for WLAN card base on ACX100
 Summary(pl):   Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100
 Release:       %{_rel}@%{_kernel_ver_str}
@@ -38,13 +38,13 @@ Group:              Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun): /sbin/depmod
 
-%description -n kernel-net-acx100
+%description -n kernel%{_alt_kernel}-net-acx100
 This is driver for WLAN card based on ACX100 for Linux.
 
-%description -n kernel-net-acx100 -l pl
+%description -n kernel%{_alt_kernel}-net-acx100 -l pl
 Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100.
 
-%package -n kernel-smp-net-acx100
+%package -n kernel%{_alt_kernel}-smp-net-acx100
 Summary:       Linux SMP driver for WLAN card base on ACX100
 Summary(pl):   Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100
 Release:       %{_rel}@%{_kernel_ver_str}
@@ -52,93 +52,49 @@ Group:              Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun): /sbin/depmod
 
-%description -n kernel-smp-net-acx100
+%description -n kernel%{_alt_kernel}-smp-net-acx100
 Linux SMP driver for WLAN card base on ACX100.
 
-%description -n kernel-smp-net-acx100 -l pl
+%description -n kernel%{_alt_kernel}-smp-net-acx100 -l pl
 Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100.
 
 %prep
 %setup -q -c
 
 %build
-# kernel module(s)
-install -d modules/{up,smp}
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-       if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-               exit 1
-       fi
-       install -d o/include/linux
-       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-%if %{with dist_kernel}
-       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-       install -d o/include/config
-       touch o/include/config/MARKER
-       ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-#
-#       patching/creating makefile(s) (optional)
-#
-       %{__make} -C %{_kernelsrcdir} clean \
-               RCS_FIND_IGNORE="-name '*.ko' -o" \
-               SYSSRC=%{_kernelsrcdir} \
-               SYSOUT=$PWD/o \
-               M=$PWD O=$PWD/o \
-               %{?with_verbose:V=1}
-       %{__make} -C %{_kernelsrcdir} modules \
-               CC="%{__cc}" CPP="%{__cpp}" \
-               SYSSRC=%{_kernelsrcdir} \
-               SYSOUT=$PWD/o \
-               M=$PWD O=$PWD/o \
-               %{?with_verbose:V=1}
-
-       mv acx.ko modules/$cfg/
-done
+%build_kernel_modules -m acx
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%install_kernel_modules -m acx -d misc
+
 # Add directory to store firmware
 install -d $RPM_BUILD_ROOT%{_datadir}/acx
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-       cfgdest=''
-       if [ "$cfg" = "smp" ]; then
-               install modules/$cfg/*.ko \
-                       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}$cfg/misc
-       else
-               install modules/$cfg/*.ko \
-                       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-       fi
-done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -n kernel-net-acx100
+%post  -n kernel%{_alt_kernel}-net-acx100
 %depmod %{_kernel_ver}
 
-%postun        -n kernel-net-acx100
+%postun        -n kernel%{_alt_kernel}-net-acx100
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-net-acx100
+%post  -n kernel%{_alt_kernel}-smp-net-acx100
 %depmod %{_kernel_ver}smp
 
-%postun        -n kernel-smp-net-acx100
+%postun        -n kernel%{_alt_kernel}-smp-net-acx100
 %depmod %{_kernel_ver}smp
 
-%files -n kernel-net-acx100
+%files -n kernel%{_alt_kernel}-net-acx100
 %defattr(644,root,root,755)
 %doc Changelog README
 %dir %{_datadir}/acx
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 
 %if %{with smp}
-%files -n kernel-smp-net-acx100
+%files -n kernel%{_alt_kernel}-smp-net-acx100
 %defattr(644,root,root,755)
 %doc Changelog README
 %dir %{_datadir}/acx