- release 1 (or: works for me)

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

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 06ec698f4e60dd1ef8d3d3d0c33eed7b16597d50..80976348183e85004f58f21ab0fd9d8c4f3a6c19 100644 (file)
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -12,23 +12,30 @@
 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:       1.9.8
+Version:       2.2.0
 %define                _rel    1
 Release:       %{_rel}
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://download.gna.org/eagleusb/%{name}-%{version}.tar.bz2
-# Source0-md5: 2545f60f436a511039456b385a5987b0
+Source0:       http://download.gna.org/eagleusb/eagle-usb-2.2.0/%{name}-%{version}.tar.bz2
+# Source0-md5: ad3d985b324b97de736f1efb723deb5d
 Patch1:                %{name}-eu_types.patch
 Patch2:                %{name}-vpivci-info.patch
 Patch3:                %{name}-opt.patch
+Patch4:                %{name}-signal.patch
+Patch5:                %{name}-usb_kill_urb.patch
 URL:           http://gna.org/projects/eagleusb/
+BuildRequires: autoconf
+BuildRequires: automake
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
 BuildRequires: rpmbuild(macros) >= 1.153
 %endif
+BuildRequires: net-tools
+BuildRequires: SysVinit
 Requires:      ppp >= 2.4.1
 Requires:      kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
+Conflicts:     eagle-usb24
 Obsoletes:     eagle-utils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -80,6 +87,8 @@ Sterownik dla Linuksa SMP do modem
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %ifnarch %{ix86}
 # invalid not only for ppc
@@ -90,23 +99,23 @@ sed -i 's/-mpreferred-stack-boundary=2//' driver/Makefile
 %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
-    rm -rf include
-    install -d include/{config,linux}
-    ln -sf %{_kernelsrcdir}/config-$cfg .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-    touch include/config/MARKER
-    %{__make} -C %{_kernelsrcdir} clean \
-       RCS_FIND_IGNORE="-name '*.ko' -o" \
-       M=$PWD O=$PWD \
-       %{?with_verbose:V=1}
-    %{__make} -C %{_kernelsrcdir} modules \
-       M=$PWD O=$PWD \
-       %{?with_verbose:V=1}
-    mv eagle-usb{,-$cfg}.ko
+       if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+               exit 1
+       fi
+       rm -rf include
+       install -d include/{config,linux}
+       ln -sf %{_kernelsrcdir}/config-$cfg .config
+       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
+       ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+       touch include/config/MARKER
+       %{__make} -C %{_kernelsrcdir} clean \
+               RCS_FIND_IGNORE="-name '*.ko' -o" \
+               M=$PWD O=$PWD \
+               %{?with_verbose:V=1}
+       %{__make} -C %{_kernelsrcdir} modules \
+               M=$PWD O=$PWD \
+               %{?with_verbose:V=1}
+       mv eagle-usb{,-$cfg}.ko
 done
 cd -
 %endif
@@ -146,6 +155,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{analog,hotplug,ppp} \
 %{__make} -C driver/firmware install \
        EU_DSP_DIR=$RPM_BUILD_ROOT%{_datadir}/misc
 %{__make} -C driver/user install \
+       EU_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb \
        EU_SCRIPT_DIR=$RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb \
        SBINDIR=$RPM_BUILD_ROOT%{_sbindir}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/eagle-usb/eagle-usb.conf{.template,}
@@ -173,7 +183,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README
 %dir %{_sysconfdir}/eagle-usb
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/eagle-usb/eagle-usb.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/eagle-usb/eagle-usb.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/eagle-usb/*.txt
 %attr(755,root,root) %{_sbindir}/*
 %{_datadir}/misc/*.bin
 %endif