SPECS: drbd.spec - rel 4 (new build way)

[arekm]

Author: arekm                        Date: Sat Feb 11 13:38:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4 (new build way)

---- Files affected:
SPECS:
   drbd.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.65 SPECS/drbd.spec:1.66
--- SPECS/drbd.spec:1.65	Thu Jan 26 10:47:33 2006
+++ SPECS/drbd.spec	Sat Feb 11 14:38:48 2006
@@ -11,11 +11,11 @@
 %undefine	with_smp
 %endif
 
+%define	rel	4
 Summary:	drbd is a block device designed to build high availibility clusters
 Summary(pl):	drbd jest urządzeniem blokowym dla klastrów o wysokiej niezawodności
 Name:		drbd
 Version:	0.7.15
-%define	rel	3
 Release:	%{rel}
 License:	GPL
 Group:		Base/Kernel
@@ -50,8 +50,8 @@
 Summary(pl):	Narzędzie konfiguracyjne i skrypty dla DRBD
 Summary(pt_BR):	Utilitários para gerenciar dispositivos DRBD
 Group:		Applications/System
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Conflicts:	drbdsetup24
 
 %description -n drbdsetup
@@ -116,26 +116,14 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-%ifarch ppc
-	if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
-		install -d include/asm
-		cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-	else
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	fi
-%else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+        install -d o/include/linux
+        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+        %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
 %if "%{_target_base_arch}" != "%{_arch}"
@@ -144,7 +132,7 @@
 %endif
 		HOSTCC="%{__cc}" \
 		CPP="%{__cpp}" \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	mv drbd{,-$cfg}.ko
 done
@@ -170,7 +158,7 @@
 install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
 
-ln -sf /etc/rc.d/init.d/drbd $RPM_BUILD_ROOT/etc/ha.d/resource.d/datadisk
+ln -sf /etc/rc.d/init.d/drbd $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/datadisk
 
 install documentation/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install documentation/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -237,6 +225,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2006/02/11 13:38:48  arekm
+- rel 4 (new build way)
+
 Revision 1.65  2006/01/26 09:47:33  arekm
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drbd.spec?r1=1.65&r2=1.66&f=u