SPECS (DEVEL): busybox.spec - ready for tests

[wiget]

Author: wiget                        Date: Thu Jan 19 11:06:20 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- ready for tests

---- Files affected:
SPECS:
   busybox.spec (1.106.2.1 -> 1.106.2.2) 

---- Diffs:

================================================================
Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.106.2.1 SPECS/busybox.spec:1.106.2.2
--- SPECS/busybox.spec:1.106.2.1	Wed Jan 18 18:13:19 2006
+++ SPECS/busybox.spec	Thu Jan 19 12:06:14 2006
@@ -38,7 +38,7 @@
 Summary(pt_BR):	BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:		busybox
 Version:	1.1.0
-Release:	0.1
+Release:	0.9
 License:	GPL
 Group:		Applications
 Source0:	http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
@@ -166,8 +166,6 @@
 %patch14 -p1 -b .wiget
 
 %build
-install %{SOURCE1} .config
-
 %if %{with initrd}
 install %{SOURCE2} .config
 %{__make} oldconfig
@@ -187,14 +185,17 @@
 
 mv -f busybox busybox.initrd
 %{__make} clean
-install %{SOURCE1} .config
 %endif
 
+%if %{with static}
 %if %{with altconfig}
-install %{SOURCE3} .config
+grep -v CONFIG_STATIC < %{SOURCE3} > .config
+echo "CONFIG_STATIC=y" >> .config
+%else
+grep -v CONFIG_STATIC < %{SOURCE1} > .config
+echo "CONFIG_STATIC=y" >> .config
 %endif
 
-%if %{with static}
 %{__make} oldconfig
 %{__make} \
 	CFLAGS_EXTRA="%{rpmcflags}" \
@@ -204,6 +205,12 @@
 %{__make} clean
 %endif
 
+%if %{with altconfig}
+install %{SOURCE3} .config
+%else
+install %{SOURCE1} .config
+%endif
+
 %{__make} oldconfig
 %{__make} \
 	CFLAGS_EXTRA="%{rpmcflags}" \
@@ -266,6 +273,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106.2.2  2006/01/19 11:06:14  wiget
+- ready for tests
+
 Revision 1.106.2.1  2006/01/18 17:13:19  wiget
 - start update to 1.1.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/busybox.spec?r1=1.106.2.1&r2=1.106.2.2&f=u