Author: adamg Date: Sun Aug 12 08:25:43 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - up bcond - buildfixes for 2.6.20+ (merged from HEAD) - alt_kernel support (BR: rpm-build-macros >= 1.308)
---- Files affected: SPECS: nozomi.spec (1.6 -> 1.6.2.1) ---- Diffs: ================================================================ Index: SPECS/nozomi.spec diff -u SPECS/nozomi.spec:1.6 SPECS/nozomi.spec:1.6.2.1 --- SPECS/nozomi.spec:1.6 Mon Feb 12 23:09:10 2007 +++ SPECS/nozomi.spec Sun Aug 12 10:25:38 2007 @@ -2,6 +2,7 @@ # # Conditional build: %bcond_without dist_kernel # allow non-distribution kernel +%bcond_without up # don't build UP module %bcond_without smp # don't build SMP module %bcond_with verbose # verbose build (V=1) @@ -21,8 +22,9 @@ # Source0-md5: 56c822da9fbd95eca422873bafff8cd3 URL: http://www.pharscape.org/ Patch0: %{name}-tty_dont_flip.patch +Patch1: %{name}-err.patch %{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.14} -BuildRequires: rpmbuild(macros) >= 1.286 +BuildRequires: rpmbuild(macros) >= 1.308 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,7 +33,7 @@ %description -l pl.UTF-8 Sterownik HSDPA dla kart bezprzewodowych Globe Trotter. -%package -n kernel-char-nozomi +%package -n kernel%{_alt_kernel}-char-nozomi Summary: Linux HSDPA driver for Broadband Wireless Data Card - Globe Trotter Summary(pl.UTF-8): Sterownik HSDPA dla Linuksa do kart bezprzewodowych Globe Trotter Release: [EMAIL PROTECTED] @@ -42,18 +44,18 @@ Requires(postun): %releq_kernel_up %endif -%description -n kernel-char-nozomi +%description -n kernel%{_alt_kernel}-char-nozomi This is HSDPA driver for Broadband Wireless Data Card - Globe Trotter for Linux. This package contains Linux module. -%description -n kernel-char-nozomi -l pl.UTF-8 +%description -n kernel%{_alt_kernel}-char-nozomi -l pl.UTF-8 Sterownik HSDPA dla Linuksa do kart bezprzewodowych Globe Trotter. Ten pakiet zawiera moduł jądra Linuksa. -%package -n kernel-smp-char-nozomi +%package -n kernel%{_alt_kernel}-smp-char-nozomi Summary: Linux SMP HSDPA driver for Broadband Wireless Data Card - Globe Trotter Summary(pl.UTF-8): Sterownik HSDPA dla Linuksa SMP do kart bezprzewodowych Globe Trotter Release: [EMAIL PROTECTED] @@ -64,13 +66,13 @@ Requires(postun): %releq_kernel_smp %endif -%description -n kernel-smp-char-nozomi +%description -n kernel%{_alt_kernel}-smp-char-nozomi This is HSDPA driver for Broadband Wireless Data Card - Globe Trotter for Linux. This package contains Linux SMP module. -%description -n kernel-smp-char-nozomi -l pl.UTF-8 +%description -n kernel%{_alt_kernel}-smp-char-nozomi -l pl.UTF-8 Sterownik HSDPA dla Linuksa do kart bezprzewodowych Globe Trotter. Ten pakiet zawiera moduł jądra Linuksa SMP. @@ -78,8 +80,12 @@ %prep %setup -q -c %patch0 -p1 +%patch1 -p1 -echo 'obj-m += nozomi.o' > Makefile +cat > Makefile << 'EOF' +obj-m += nozomi.o +nozomi-objs += kfifo.o +EOF %build @@ -93,25 +99,25 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -n kernel-char-nozomi +%post -n kernel%{_alt_kernel}-char-nozomi %depmod %{_kernel_ver} -%postun -n kernel-char-nozomi +%postun -n kernel%{_alt_kernel}-char-nozomi %depmod %{_kernel_ver} -%post -n kernel-smp-char-nozomi +%post -n kernel%{_alt_kernel}-smp-char-nozomi %depmod %{_kernel_ver}smp -%postun -n kernel-smp-char-nozomi +%postun -n kernel%{_alt_kernel}-smp-char-nozomi %depmod %{_kernel_ver}smp -%files -n kernel-char-nozomi +%files -n kernel%{_alt_kernel}-char-nozomi %defattr(644,root,root,755) %doc CHANGELOG readme todo /lib/modules/%{_kernel_ver}/kernel/drivers/char/*.ko* %if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-char-nozomi +%files -n kernel%{_alt_kernel}-smp-char-nozomi %defattr(644,root,root,755) %doc CHANGELOG readme todo /lib/modules/%{_kernel_ver}smp/kernel/drivers/char/*.ko* @@ -123,6 +129,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6.2.1 2007/08/12 08:25:38 adamg +- up bcond +- buildfixes for 2.6.20+ (merged from HEAD) +- alt_kernel support (BR: rpm-build-macros >= 1.308) + Revision 1.6 2007/02/12 22:09:10 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nozomi.spec?r1=1.6&r2=1.6.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
