SPECS: ndas.spec - new kernel building style - not tested
shadzik
shadzik at pld-linux.org
Sat Aug 9 18:52:47 CEST 2008
Author: shadzik Date: Sat Aug 9 16:52:47 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- new kernel building style
- not tested
---- Files affected:
SPECS:
ndas.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SPECS/ndas.spec
diff -u SPECS/ndas.spec:1.6 SPECS/ndas.spec:1.7
--- SPECS/ndas.spec:1.6 Wed Mar 14 01:23:26 2007
+++ SPECS/ndas.spec Sat Aug 9 18:52:42 2008
@@ -3,8 +3,6 @@
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
-%bcond_without up # don't build UP module
-%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
@@ -26,8 +24,8 @@
Patch0: %{name}-Makefile.patch
URL: http://www.ximeta.com/
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires: rpmbuild(macros) >= 1.330
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires: rpmbuild(macros) >= 1.379
%endif
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,9 +44,8 @@
Release: %{_rel}@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun): %releq_kernel_up
+%requires_releq_kernel
+Requires(postun): %releq_kernel
%endif
%description -n kernel%{_alt_kernel}-block-ndas
@@ -61,27 +58,6 @@
Ten pakiet zawiera moduł jądra Linuksa.
-%package -n kernel%{_alt_kernel}-smp-block-ndas
-Summary: Linux SMP driver for NDAS
-Summary(pl.UTF-8): Sterownik dla Linuksa SMP do NDAS
-Release: %{_rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun): %releq_kernel_smp
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-block-ndas
-This is driver for NDAS for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-block-ndas -l pl.UTF-8
-Sterownik dla Linuksa do NDAS.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
%prep
%setup -q -n %{name}-%{version}-%{_subver}
%patch0 -p1
@@ -119,12 +95,6 @@
%postun -n kernel%{_alt_kernel}-block-ndas
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-block-ndas
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-block-ndas
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -132,25 +102,21 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-block-ndas
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/drivers/block/*.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-block-ndas
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/block/*.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2008/08/09 16:52:42 shadzik
+- new kernel building style
+- not tested
+
Revision 1.6 2007/03/14 00:23:26 glen
- up bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ndas.spec?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list