packages (DEVEL): uClibc/uClibc.spec - started DEVEL branch at 0.9.31 - mer...

[qboosh]

Author: qboosh                       Date: Sun Jun 12 06:24:21 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- started DEVEL branch at 0.9.31
- merged more llh symlinks from HEAD (+sparc update: use merged tree from llh 2.6.27+)

---- Files affected:
packages/uClibc:
   uClibc.spec (1.195 -> 1.195.4.1) 

---- Diffs:

================================================================
Index: packages/uClibc/uClibc.spec
diff -u packages/uClibc/uClibc.spec:1.195 packages/uClibc/uClibc.spec:1.195.4.1
--- packages/uClibc/uClibc.spec:1.195	Mon Aug 23 20:53:04 2010
+++ packages/uClibc/uClibc.spec	Sun Jun 12 08:24:16 2011
@@ -13,7 +13,7 @@
 Name:		uClibc
 Version:	0.9.31
 Release:	1
-Epoch:		3
+Epoch:		4
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://uclibc.org/downloads/%{name}-%{version}.tar.bz2
@@ -30,7 +30,7 @@
 BuildRequires:	binutils-gasp
 BuildRequires:	cpp
 BuildRequires:	gcc >= 5:3.0
-BuildRequires:	linux-libc-headers >= 7:2.6.24
+BuildRequires:	linux-libc-headers >= 7:2.6.27
 BuildRequires:	make >= 3.80
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.453
@@ -57,7 +57,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	binutils-gasp
-Requires:	linux-libc-headers >= 7:2.6.24
+Requires:	linux-libc-headers >= 7:2.6.27
 %requires_eq	gcc
 
 %description devel
@@ -246,15 +246,11 @@
 	fi
 done
 
-rm -rf $RPM_BUILD_ROOT%{uclibc_root}/usr/include/{linux,asm*}
-ln -sf /usr/include/asm $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm
-ln -sf /usr/include/asm-generic $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm-generic
-# for future use
-%ifarch sparc64
-ln -sf /usr/include/asm-sparc $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm-sparc
-ln -sf /usr/include/asm-sparc64 $RPM_BUILD_ROOT%{uclibc_root}/usr/include/asm-sparc64
-%endif
-ln -sf /usr/include/linux $RPM_BUILD_ROOT%{uclibc_root}/usr/include/linux
+%{__rm} -r $RPM_BUILD_ROOT%{uclibc_root}/usr/include/{linux,asm*}
+# rpm -ql linux-libc-headers | awk -F/ ' /^\/usr\/include\// { print "/usr/include/" $4 } ' | sort -u
+for dir in asm asm-generic linux mtd rdma sound video xen; do
+	ln -sf /usr/include/${dir} $RPM_BUILD_ROOT%{uclibc_root}/usr/include/${dir}
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -329,6 +325,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.195.4.1  2011/06/12 06:24:16  qboosh
+- started DEVEL branch at 0.9.31
+- merged more llh symlinks from HEAD (+sparc update: use merged tree from llh 2.6.27+)
+
 Revision 1.195  2010/08/23 18:53:04  baggins
 - enable UCLIBC_HAS_PROGRAM_INVOCATION_NAME for util-linux
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc.spec?r1=1.195&r2=1.195.4.1&f=u