SPECS: template-kernel-module.spec, dazuko.spec - use macros that ...

[glen]

Author: glen                         Date: Thu Mar  2 17:40:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use macros that don't break spec syntax

---- Files affected:
SPECS:
   template-kernel-module.spec (1.30 -> 1.31) , dazuko.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/template-kernel-module.spec
diff -u SPECS/template-kernel-module.spec:1.30 SPECS/template-kernel-module.spec:1.31
--- SPECS/template-kernel-module.spec:1.30	Sun Feb 19 11:02:07 2006
+++ SPECS/template-kernel-module.spec	Thu Mar  2 18:39:57 2006
@@ -35,7 +35,7 @@
 #URL:		-
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.217
+BuildRequires:	rpmbuild(macros) >= 1.286
 %endif
 #BuildRequires:	-
 #PreReq:		-
@@ -61,8 +61,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%{requires_releq_kernel_up}
+%{requires_releq_kernel_up -s postun}
 %endif
 
 %description -n kernel-MODULE_DIR-MODULE_NAME
@@ -82,8 +82,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
+%{requires_releq_kernel_smp}
+%{requires_releq_kernel_smp -s postun}
 %endif
 
 %description -n kernel-smp-MODULE_DIR-MODULE_NAME
@@ -198,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2006/03/02 17:39:57  glen
+- use macros that don't break spec syntax
+
 Revision 1.30  2006/02/19 10:02:07  pluto
 - copy-pasto fix.
 

================================================================
Index: SPECS/dazuko.spec
diff -u SPECS/dazuko.spec:1.11 SPECS/dazuko.spec:1.12
--- SPECS/dazuko.spec:1.11	Thu Mar  2 18:10:03 2006
+++ SPECS/dazuko.spec	Thu Mar  2 18:39:57 2006
@@ -25,7 +25,7 @@
 URL:		http://www.dazuko.org/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.217
+BuildRequires:	rpmbuild(macros) >= 1.286
 %endif
 BuildRequires:	bash
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,8 +61,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%{requires_releq_kernel_up}
+%{requires_releq_kernel_up -s postun}
 %endif
 
 %description -n kernel-misc-%{name}
@@ -80,8 +80,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
+%{requires_releq_kernel_smp}
+%{requires_releq_kernel_smp -s postun}
 %endif
 
 %description -n kernel-smp-misc-%{name}
@@ -153,7 +153,7 @@
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 %if %{with dist_kernel}
-	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
 	install -d o/include/config
 	touch o/include/config/MARKER
@@ -268,6 +268,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/03/02 17:39:57  glen
+- use macros that don't break spec syntax
+
 Revision 1.11  2006/03/02 17:10:03  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-kernel-module.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/dazuko.spec?r1=1.11&r2=1.12&f=u