Author: wolvverine Date: Wed Dec 5 18:13:21 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - clean,patch, pci/usb subpackage
---- Files affected: SPECS: unicorn.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/unicorn.spec diff -u SPECS/unicorn.spec:1.9 SPECS/unicorn.spec:1.10 --- SPECS/unicorn.spec:1.9 Wed Dec 5 14:29:25 2007 +++ SPECS/unicorn.spec Wed Dec 5 19:13:16 2007 @@ -6,9 +6,8 @@ # - rc-scripts support? # # Conditional build: -%bcond_without dist_kernel # allow non-distribution kernel +%bcond_without dist_kernel # allow non-distribution kernel %bcond_without kernel # don't build kernel modules -%bcond_without smp # don't build SMP module %bcond_without userspace # don't build userspace module %bcond_with verbose # verbose build (V=1) %bcond_with usb # build usb driver @@ -23,6 +22,7 @@ Group: Base/Kernel Source0: http://www.bewan.com/bewan/drivers/A1012-A1006-A904-A888-A983-%{version}.tgz # Source0-md5: ff9829f03168279a079d05aea780ee99 +Patch0: %{name}-makefile.patch URL: http://www.bewan.com/ %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.22} BuildRequires: rpmbuild(macros) >= 1.379 @@ -35,7 +35,7 @@ %description -l pl.UTF-8 Narzędzia do modemów ADSL Unicorn. -%package -n kernel%{_alt_kernel}-net-%{name} +%package -n kernel%{_alt_kernel}-net-%{name}-pci Summary: Unicorn ADSL modem drivers for Linux kernel Summary(pl.UTF-8): Sterowniki do modemów ADSL Unicorn dla jądra Linuksa Release: [EMAIL PROTECTED] @@ -45,14 +45,31 @@ Requires(post,postun): /sbin/depmod Requires: module-init-tools >= 3.2.2-2 -%description -n kernel%{_alt_kernel}-net-%{name} +%description -n kernel%{_alt_kernel}-net-%{name}-pci Unicorn ADSL modem drivers for Linux kernel. -%description -n kernel%{_alt_kernel}-net-%{name} -l pl.UTF-8 +%description -n kernel%{_alt_kernel}-net-%{name}-pci -l pl.UTF-8 +Sterowniki do modemów ADSL Unicorn dla jądra Linuksa. + +%package -n kernel%{_alt_kernel}-net-%{name}-usb +Summary: Unicorn ADSL usb modem drivers for Linux kernel +Summary(pl.UTF-8): Sterowniki do modemówusb ADSL Unicorn dla jądra Linuksa +Release: [EMAIL PROTECTED] +Provides: %{name} +%{?with_dist_kernel:%requires_releq_kernel} +Group: Base/Kernel +Requires(post,postun): /sbin/depmod +Requires: module-init-tools >= 3.2.2-2 + +%description -n kernel%{_alt_kernel}-net-%{name}-usb +Unicorn ADSL modem drivers for Linux kernel. + +%description -n kernel%{_alt_kernel}-net-%{name}-usb -l pl.UTF-8 Sterowniki do modemów ADSL Unicorn dla jądra Linuksa. %prep %setup -q -n %{name} +%patch0 -p1 %build %if %{with userspace} @@ -60,13 +77,8 @@ %endif %if %{with kernel} -#mv include/linux/autoconf.h include/linux/autoconf-smp.h -%build_kernel_modules -m unicorn_{pci_atm,pci_eth,usb_atm,usb_eth} - -# mv unicorn_pci_atm{,-$cfg}.ko -# mv unicorn_pci_eth{,-$cfg}.ko -# mv unicorn_usb_atm{,-$cfg}.ko -# mv unicorn_usb_eth{,-$cfg}.ko +%build_kernel_modules -C libm -C unicorn_pci -m unicorn_{pci_atm,pci_eth} +%{?with_usb:%build_kernel_modules -C unicorn_usb -m unicorn_usb_atm,unicorn_usb_eth} %endif %install @@ -81,16 +93,22 @@ %endif %if %{with kernel} -%install_kernel_modules -s %{_mod_suffix} -n %{name} -m unicorn_{pci_atm,pci_eth,usb_atm,usb_eth} -d net +%install_kernel_modules -m unicorn_{pci_atm,pci_eth,usb_atm,usb_eth} -d net %endif %clean rm -rf $RPM_BUILD_ROOT -%post -n kernel%{_alt_kernel}-net-%{name} +%post -n kernel%{_alt_kernel}-net-%{name}-pci +%depmod %{_kernel_ver} + +%postun -n kernel%{_alt_kernel}-net-%{name}-pci %depmod %{_kernel_ver} -%postun -n kernel%{_alt_kernel}-net-%{name} +%post -n kernel%{_alt_kernel}-net-%{name}-usb +%depmod %{_kernel_ver} + +%postun -n kernel%{_alt_kernel}-net-%{name}-usb %depmod %{_kernel_ver} %if %{with userspace} @@ -102,17 +120,28 @@ %endif %if %{with kernel} -%files -n kernel%{_alt_kernel}-net-%{name} +%files -n kernel%{_alt_kernel}-net-%{name}-pci %defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/* +/lib/modules/%{_kernel_ver}/misc/*pci* + +%if %{with usb} +%files -n kernel%{_alt_kernel}-net-%{name}-usb +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/*usb* + +%endif %endif + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2007-12-05 18:13:16 wolvverine +- clean,patch, pci/usb subpackage + Revision 1.9 2007-12-05 13:29:25 wolvverine - upps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unicorn.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
