- %{_alt_kernel} support

- use %build_kernel_modules, %install_kernel_modules macros
- R/P: kernel-usb(eagle) instead of package name
- do not require in userspace module with same %{_kernel_ver_str}

Changed files:
    eagle-usb.spec -> 1.83

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 9ac71cfcbf48a1bff2a11681dce89eed9e58c9bc..9fbdb37db7fb714c8ce7b12fa93f181624dfe5d9 100644 (file)
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -38,12 +38,12 @@ URL:                http://gna.org/projects/eagleusb/
 BuildRequires: autoconf
 BuildRequires: automake
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.153
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires: rpmbuild(macros) >= 1.326
 %endif
 BuildRequires: SysVinit
 BuildRequires: net-tools
-Requires:      kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
+Requires:      kernel-usb(eagle) = %{version}-%{_rel}
 Requires:      ppp >= 2.4.1
 Obsoletes:     eagle-utils
 Conflicts:     eagle-usb24
@@ -57,38 +57,43 @@ modems.
 Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
 800/840/908/...).
 
-%package -n kernel-usb-eagle
+%package -n kernel%{_alt_kernel}-usb-eagle
 Summary:       Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
 Summary(pl):   Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun): /sbin/depmod
+Provides:      kernel-usb(eagle) = %{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{_nil}"
 Obsoletes:     kernel-usb-fast800
+%endif
 
-%description -n kernel-usb-eagle
+%description -n kernel%{_alt_kernel}-usb-eagle
 Linux driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...)
 modems.
 
-%description -n kernel-usb-eagle -l pl
+%description -n kernel%{_alt_kernel}-usb-eagle -l pl
 Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st
 800/840/908/...).
 
-%package -n kernel-smp-usb-eagle
+%package -n kernel%{_alt_kernel}-smp-usb-eagle
 Summary:       Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800/840/908/...) modems
 Summary(pl):   Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st 800/840/908/...)
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun): /sbin/depmod
-Provides:      kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
+Provides:      kernel-usb(eagle) = %{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{_nil}"
 Obsoletes:     kernel-smp-usb-fast800
+%endif
 
-%description -n kernel-smp-usb-eagle
+%description -n kernel%{_alt_kernel}-smp-usb-eagle
 Linux SMP driver for the Eagle 8051 Analog (sagem f@st
 800/840/908/...) modems.
 
-%description -n kernel-smp-usb-eagle -l pl
+%description -n kernel%{_alt_kernel}-smp-usb-eagle -l pl
 Sterownik dla Linuksa SMP do modemów Eagle 8051 Analog (sagem f@st
 800/840/908/...).
 
@@ -112,27 +117,7 @@ sed -i 's/-mpreferred-stack-boundary=2//' driver/Makefile
 %build
 %if %{with kernel}
 cd driver
-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
-       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
-%{__make} -C %{_kernelsrcdir} clean \
-               RCS_FIND_IGNORE="-name '*.ko' -o" \
-               M=$PWD O=$PWD/o \
-               %{?with_verbose:V=1}
-%{__make} -C %{_kernelsrcdir} modules \
-               RCS_FIND_IGNORE="-name '*.ko' -o" \
-               M=$PWD O=$PWD/o \
-       %{?with_verbose:V=1} \
-       USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
-       mv eagle-usb{,-$cfg}.ko
-done
+%build_kernel_modules -m eagle-usb USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
 cd -
 %endif
 
@@ -159,13 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
 cd driver
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/usb/net
-install eagle-usb-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/eagle-usb.ko
-%if %{with smp} && %{with dist_kernel}
-install eagle-usb-smp.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/eagle-usb.ko
-%endif
+%install_kernel_modules -m eagle-usb -d kernel/drivers/usb/net
 cd -
 %endif
 
@@ -186,16 +165,16 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb/eagle-usb.conf{.template,}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-usb-eagle
+%post -n kernel%{_alt_kernel}-usb-eagle
 %depmod %{_kernel_ver}
 
-%postun -n kernel-usb-eagle
+%postun -n kernel%{_alt_kernel}-usb-eagle
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-usb-eagle
+%post -n kernel%{_alt_kernel}-smp-usb-eagle
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-usb-eagle
+%postun -n kernel%{_alt_kernel}-smp-usb-eagle
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -210,12 +189,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with kernel}
-%files -n kernel-usb-eagle
+%files -n kernel%{_alt_kernel}-usb-eagle
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-usb-eagle
+%files -n kernel%{_alt_kernel}-smp-usb-eagle
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/*.ko*
 %endif