X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eagle-usb.spec;h=6160bd966002b6d122f1c8e484bc10ba3c664320;hb=89ff8b7f1f41b0a20fb20578024f8d1381463c88;hp=6cb6147a5a2f829a522ec41859f284a4a7991805;hpb=35d3e0d33a2f2888eed46b5b8bdfabae94753b7f;p=packages%2Feagle-usb.git

diff --git a/eagle-usb.spec b/eagle-usb.spec
index 6cb6147..6160bd9 100644
--- a/eagle-usb.spec
+++ b/eagle-usb.spec
@@ -7,30 +7,41 @@
 %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:	1.9.6
-%define		_rel	0.6
+Version:	2.3.2
+%define		_rel	5
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://download.gna.org/eagleusb/%{name}-%{version}.tar.bz2
-# Source0-md5:	d2d94f396132e34417fa1b26bcde7287
-Patch0:		%{name}-eu_main.patch
+Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	91727db818e5170b2d78a99ee51c2d58
 Patch1:		%{name}-eu_types.patch
-Patch2:		%{name}-ppc.patch
-Patch3:		%{name}-vpivci-info.patch
-Patch4:		%{name}-wait.patch
+Patch2:		%{name}-vpivci-info.patch
+Patch3:		%{name}-opt.patch
+Patch4:		%{name}-signal.patch
+Patch5:		%{name}-usb_kill_urb.patch
+Patch6:		%{name}-kernel_sources_checking_hack.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}}
+Requires:	kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
+Conflicts:	eagle-usb24
 Obsoletes:	eagle-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,7 +77,7 @@ Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-usb-eagle
+Provides:	kernel-usb-eagle = %{version}-%{_rel}@%{_kernel_ver_str}
 Obsoletes:	kernel-smp-usb-fast800
 
 %description -n kernel-smp-usb-eagle
@@ -79,11 +90,12 @@ Sterownik dla Linuksa SMP do modem
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %ifnarch %{ix86}
 # invalid not only for ppc
@@ -94,20 +106,31 @@ 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-up .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-    touch include/config/MARKER
-    %{__make} -C %{_kernelsrcdir} modules \
-	RCS_FIND_IGNORE="-name '*.ko' -o" \
-	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
+%ifarch ppc ppc64
+	install -d include/asm
+	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+%else
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+	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} \
+		USE_CMVS=%{?with_cmvs:1}%{!?with_cmvs:0}
+	mv eagle-usb{,-$cfg}.ko
 done
 cd -
 %endif
@@ -115,13 +138,15 @@ cd -
 %if %{with userspace}
 %{__aclocal} -I .
 %{__autoconf}
-%configure
+%configure \
+	%{!?with_cmvs:--disable-cmvs} \
+	--with-dsp-dir=%{_datadir}/misc 
 %{__make} -C driver/firmware \
-	CFLAGS="%{rpmcflags}"
+	OPT="%{rpmcflags}"
 %{__make} -C driver/user \
-	CFLAGS="%{rpmcflags} -DBIN_DIR=\"\\\"%{_datadir}/misc\\\"\" -DCONF_DIR=\"\\\"%{_sysconfdir}/eagle-usb\\\"\""
+	OPT="%{rpmcflags}"
 %{__make} -C pppoa \
-	CFLAGS="%{rpmcflags}"
+	OPT="%{rpmcflags}"
 %endif
 
 %install
@@ -145,6 +170,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,}
@@ -162,17 +188,18 @@ rm -rf $RPM_BUILD_ROOT
 %depmod %{_kernel_ver}
 
 %post -n kernel-smp-usb-eagle
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %postun -n kernel-smp-usb-eagle
-%depmod %{_kernel_ver}
+%depmod %{_kernel_ver}smp
 
 %if %{with userspace}
 %files
 %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