- rel 4

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

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 10b688550e56b94535b0a279397904c92012adf4..d42d3afd9f070a238dab5ee39a537344accd0f44 100644 (file)
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -7,16 +7,18 @@
 %bcond_without kernel          # don't build kernel modules
 %bcond_without smp             # don't build SMP module
 %bcond_without userspace       # don't build userspace tools
+%bcond_without cmvs
 %bcond_with    verbose         # verbose build (V=1)
 #
 %ifarch sparc
+# no USB in sparc(32) kernel; just build userspace to use with sparc64 kernel
 %undefine      with_kernel
 %endif
 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/...)
 Name:          eagle-usb
 Version:       2.3.2
-%define                _rel    1
+%define                _rel    4
 Release:       %{_rel}
 License:       GPL v2
 Group:         Base/Kernel
@@ -28,7 +30,6 @@ Patch3:               %{name}-opt.patch
 Patch4:                %{name}-signal.patch
 Patch5:                %{name}-usb_kill_urb.patch
 Patch6:                %{name}-kernel_sources_checking_hack.patch
-Patch7:                %{name}-2.6.14-rc-git-breakage-fix.diff
 URL:           http://gna.org/projects/eagleusb/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -95,7 +96,6 @@ Sterownik dla Linuksa SMP do modem
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %ifnarch %{ix86}
 # invalid not only for ppc
@@ -129,7 +129,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        %{__make} -C %{_kernelsrcdir} modules \
                M=$PWD O=$PWD \
                %{?with_verbose:V=1} \
-               USE_CMVS=1
+               USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
        mv eagle-usb{,-$cfg}.ko
 done
 cd -
@@ -139,6 +139,7 @@ cd -
 %{__aclocal} -I .
 %{__autoconf}
 %configure \
+       %{!?with_cmvs:--disable-cmvs} \
        --with-dsp-dir=%{_datadir}/misc 
 %{__make} -C driver/firmware \
        OPT="%{rpmcflags}"