SPECS (LINUX_2_6_22): uClibc.spec - merge fixes from HEAD

[glen]

Author: glen                         Date: Tue Apr  1 23:47:16 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- merge fixes from HEAD

---- Files affected:
SPECS:
   uClibc.spec (1.153.2.1 -> 1.153.2.2) 

---- Diffs:

================================================================
Index: SPECS/uClibc.spec
diff -u SPECS/uClibc.spec:1.153.2.1 SPECS/uClibc.spec:1.153.2.2
--- SPECS/uClibc.spec:1.153.2.1	Wed Apr  2 01:21:58 2008
+++ SPECS/uClibc.spec	Wed Apr  2 01:47:11 2008
@@ -13,7 +13,7 @@
 Version:	0.9.29
 Release:	10
 Epoch:		2
-License:	LGPL
+License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://uclibc.org/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	61dc55f43b17a38a074f347e74095b20
@@ -106,8 +106,8 @@
 	OPTIMIZATION="%{rpmcflags} -Os" \
 	CC="%{__cc}"
 
-mv -f .config .config.tmp
-sed -e 's/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/;
+sed -i -e '
+	s/^.*UCLIBC_HAS_IPV6.*$/UCLIBC_HAS_IPV6=y/;
 	s/^.*DO_C99_MATH.*$/DO_C99_MATH=y/;
 	s/^.*UCLIBC_HAS_RPC.*/UCLIBC_HAS_RPC=y\n# UCLIBC_HAS_FULL_RPC is not set\n# UCLIBC_HAS_REENTRANT_RPC is not set/;
 	s/^.*UCLIBC_HAS_SYS_SIGLIST.*$/UCLIBC_HAS_SYS_SIGLIST=y/;
@@ -117,8 +117,9 @@
 %endif
 	s/^.*UCLIBC_HAS_PRINTF_M_SPEC.*$/UCLIBC_HAS_PRINTF_M_SPEC=y/;
 	s/^.*UCLIBC_SUSV3_LEGACY.*$/UCLIBC_SUSV3_LEGACY=y\nUCLIBC_SUSV3_LEGACY_MACROS=y/;
-%{?debug:s/^.*\<DODEBUG\>.*$/DODEBUG=y/;s/^.*SUPPORT_LD_DEBUG\>.*$/SUPPORT_LD_DEBUG=y/;s/^.*SUPPORT_LD_DEBUG_EARLY.*$/SUPPORT_LD_DEBUG_EARLY=y/;s/^.*\<DOSTRIP\>.*$/# DOSTRIP is not set/;}
-	' .config.tmp > .config
+	s/^.*\<DOSTRIP\>.*$/# DOSTRIP is not set/;
+%{?debug:s/^.*\<DODEBUG\>.*$/DODEBUG=y/;s/^.*SUPPORT_LD_DEBUG\>.*$/SUPPORT_LD_DEBUG=y/;s/^.*SUPPORT_LD_DEBUG_EARLY.*$/SUPPORT_LD_DEBUG_EARLY=y/;}
+' .config
 
 # force regeneration after .config changes
 rm -f include/bits/uClibc_config.h
@@ -131,7 +132,6 @@
 	HOSTCC="%{__cc}" \
 	HOSTCFLAGS="%{rpmcflags} %{rpmldflags}" \
 	OPTIMIZATION="%{rpmcflags} -Os" \
-	DOSTRIP=n \
 	CC="%{__cc}"
 
 %install
@@ -249,6 +249,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153.2.2  2008-04-01 23:47:11  glen
+- merge fixes from HEAD
+
 Revision 1.153.2.1  2008-04-01 23:21:58  glen
 - builds for ac, shared disabled on x86_64 as i can't find where -fPIC gets
   _not_ passed and as it was never enabled for AC it's not regression either
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/uClibc.spec?r1=1.153.2.1&r2=1.153.2.2&f=u