- firmware-upgrade tool added.

Changed files:
    atmelwlandriver.spec -> 1.15

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index 89b6be9439cf675d6f966670349ca53f0438adaa..1e368c679252fd60e034d2be9cb5476937306d5c 100644 (file)
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -7,14 +7,14 @@
 %bcond_with    verbose         # verbose build (V=1)
 #
 # TODO:
 %bcond_with    verbose         # verbose build (V=1)
 #
 # TODO:

-#              - X11 tools (xvnet is only graphical version of ncursed lvnet. do we need it?).
-#              - command line version of firmware upgrade tool.
+#              - src/apps/winter
+#              - src/apps/fw-upgrade/fucd

 #
 Summary:       Linux driver for WLAN card based on AT76C5XXx
 Summary(pl):   Sterownik dla Linuxa do kart WLAN opartych na uk³adzie AT76C5XXx
 Name:          kernel-net-atmelwlandriver
 Version:       3.3.5.6
 #
 Summary:       Linux driver for WLAN card based on AT76C5XXx
 Summary(pl):   Sterownik dla Linuxa do kart WLAN opartych na uk³adzie AT76C5XXx
 Name:          kernel-net-atmelwlandriver
 Version:       3.3.5.6

-%define                _rel    0.3
+%define                _rel    0.4

 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel


@@ -133,12 +133,14 @@ done
 %endif
 
 %if %{with userspace}
 %endif
 
 %if %{with userspace}

-#        make lvnet              - compile lvnet utility

 #        make winter             - compile winter utility - ( CAUTION : MUST have wxwindows installed )
 
 %{__make} lvnet \
 #        make winter             - compile winter utility - ( CAUTION : MUST have wxwindows installed )
 
 %{__make} lvnet \

-       INC="%{_includedir}/ncurses -I../../includes" \

        OPT="%{rpmcflags} %{rpmldflags}"
        OPT="%{rpmcflags} %{rpmldflags}"

+
+%{__make} -C src/apps/fw-upgrade atmelup \
+       CCC=%{__cc} \
+       CCFLAGS="%{rpmcflags}"

 %endif
 
 %install
 %endif
 
 %install


@@ -168,6 +170,7 @@ cp scripts/fastvnet.sh $RPM_BUILD_ROOT%{_sbindir}
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 #mv -f scripts/.vnetrc $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
 install man/lvnet.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 #mv -f scripts/.vnetrc $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
 install man/lvnet.1 $RPM_BUILD_ROOT%{_mandir}/man1

+install src/apps/fw-upgrade/atmelup $RPM_BUILD_ROOT%{_sbindir}

 install src/apps/cmd_line/lvnet $RPM_BUILD_ROOT%{_sbindir}
 %endif
 
 install src/apps/cmd_line/lvnet $RPM_BUILD_ROOT%{_sbindir}
 %endif
 


@@ -229,6 +232,7 @@ done
 %if %{with userspace}
 %files -n atmelwlandriver-tools
 %defattr(644,root,root,755)
 %if %{with userspace}
 %files -n atmelwlandriver-tools
 %defattr(644,root,root,755)

+%attr(755,root,root) %{_sbindir}/atmelup

 %attr(755,root,root) %{_sbindir}/lvnet
 %{_mandir}/man1/*
 %endif
 %attr(755,root,root) %{_sbindir}/lvnet
 %{_mandir}/man1/*
 %endif