- forgot for the rest subpackages

[packages/eagle-usb.git] / eagle-usb.spec

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 8eba8609050c61fcb1ff01304c5b212fce8e7daa..30c04539ed33aa1d7c47e85cfd03c8ae866a8a97 100644 (file)
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -7,7 +7,7 @@ Summary:        Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems
 Summary(pl):   Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f@st 800...)
 Name:          eagle-utils
 Version:       1.0.4
-%define        _rel    5
+%define        _rel    7
 Release:       %{_rel}
 License:       GPL
 Group:         Base/Kernel
@@ -20,9 +20,10 @@ URL:         http://fast800.tuxfamily.org/
 BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.118
 Requires(post,postun): /sbin/depmod
-Requires(post,postun): /sbin/update-usb.usermap
+#Requires(post,postun):        /sbin/update-usb.usermap
 Requires:      ppp >= 2.4.1
-Requires:      hotplug
+#Requires:     hotplug
+%{!?_without_dist_kernel:Requires:     kernel-usb-%{_orig_name} = %{version}-%{_rel}@%{_kernel_ver_str}}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,7 +40,7 @@ Release:      %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 %{!?_without_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun): /sbin/depmod
-Requires(post,postun): /sbin/update-usb.usermap
+#Requires(post,postun):        /sbin/update-usb.usermap
 
 %description -n kernel-usb-%{_orig_name}
 Linux driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
@@ -54,8 +55,9 @@ Summary(pl):  Sterownik dla Linuksa SMP do modem
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 %{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{!?_without_dist_kernel:Provides:     kernel-usb-%{_orig_name}}
 Requires(post,postun): /sbin/depmod
-Requires(post,postun): /sbin/update-usb.usermap
+#Requires(post,postun):        /sbin/update-usb.usermap
 
 %description -n kernel-smp-usb-%{_orig_name}
 Linux SMP driver for the Eagle 8051 Analog (sagem f@st 800...) modems.
@@ -75,15 +77,23 @@ install -d kernel-{up,smp}
 # UP
 %{__make} clean
 %{__make} -C driver \
-       CC=%{kgcc} \
+       CC=%{__cc} \
+%ifarch %{ix86} 
+       OPT="-I/usr/src/linux/include/asm-i386/mach-default" \
+%endif
        KERNELSRC="%{_kernelsrcdir}"
 install driver/adiusbadsl.o kernel-up
 
 # SMP
 CONFIG_SMP=y; export CONFIG_SMP
 %{__make} -C driver clean
-%{__make} -e -C driver \
-       CC=%{kgcc} \
+%{__make} -C driver \
+       CC=%{__cc} \
+%ifarch %{ix86} 
+       OPT="-I/usr/src/linux/include/asm-i386/mach-default -DSMP -D__SMP__" \
+%else
+       OPT="-D__SMP__ -DSMP" \
+%endif
        KERNELSRC="%{_kernelsrcdir}"
 install driver/adiusbadsl.o kernel-smp/