SPECS: ueagle-atm4.spec - was still way to messy - cleanup - fix d...

[shadzik]

Author: shadzik                      Date: Sun Jul  1 16:02:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- was still way to messy - cleanup
- fix dir issue

---- Files affected:
SPECS:
   ueagle-atm4.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/ueagle-atm4.spec
diff -u SPECS/ueagle-atm4.spec:1.11 SPECS/ueagle-atm4.spec:1.12
--- SPECS/ueagle-atm4.spec:1.11	Sun Jul  1 17:24:28 2007
+++ SPECS/ueagle-atm4.spec	Sun Jul  1 18:02:04 2007
@@ -36,14 +36,11 @@
 Summary:	The non-free firmware for eagle (SAGEM f at st) USB ADSL modem
 License:	restricted, non-distributable
 Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description firmware
 The non-free firmware for eagle (SAGEM f at st E4) USB ADSL modem.
 
-%prep
-%setup -q -n ueagle-atm4
-%patch0 -p1
-
 %package kernel-usb-atm
 Summary:	Kernel module for ueagle-atm4
 Group:		Base/Kernel
@@ -52,22 +49,24 @@
 %description kernel-usb-atm
 Linux kernel module for ueagle-atm4.
 
+%prep
+%setup -q -n ueagle-atm4
+%patch0 -p1
+
 %build
 %build_kernel_modules -m %{_modname} -C driver
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%install_kernel_modules  -m driver/%{_modname} -d drivers/usb/atm
+
 %if %{with firmware}
 install -d $RPM_BUILD_ROOT%{hotplugfwdir}/ueagle-atm
-
 install firmware/*.bin $RPM_BUILD_ROOT%{hotplugfwdir}/ueagle-atm
 install firmware/*.fw $RPM_BUILD_ROOT%{hotplugfwdir}/ueagle-atm
 %endif
 
-cd driver
-%install_kernel_modules -m %{_modname} -d drivers/usb/atm
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,15 +78,14 @@
 
 %files kernel%{_alt_kernel}-usb-atm
 %defattr(644,root,root,755)
-%dir /lib/modules/%{_kernel_ver}/drivers/usb/atm/
-/lib/modules/%{_kernel_ver}/drivers/usb/atm/%{_modname}*
+/lib/modules/%{_kernel_ver}/drivers/usb/atm/%{_modname}.ko*
+
 %if %{with firmware}
 %files firmware
 %defattr(644,root,root,755)
 %dir /lib/firmware/ueagle-atm
 /lib/firmware/ueagle-atm/e4_dsp_pots.bin
 /lib/firmware/ueagle-atm/eagleIV.fw
-
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -96,6 +94,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/07/01 16:02:04  shadzik
+- was still way to messy - cleanup
+- fix dir issue
+
 Revision 1.11  2007/07/01 15:24:28  paszczus
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ueagle-atm4.spec?r1=1.11&r2=1.12&f=u