- rel 2

[packages/klibc.git] / klibc.spec

diff --git a/klibc.spec b/klibc.spec
index af275d20a7ed3beae815137cf42cb26313db5a7b..297aa03309efb476e3bf7f22e56f5faecde684fc 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -6,18 +6,18 @@
 Summary:       Minimalistic libc subset for use with initramfs
 Summary(pl.UTF-8):     Zminimalizowany podzbiór biblioteki C do używania z initramfs
 Name:          klibc
-Version:       1.5
-Release:       1
+Version:       1.5.15
+Release:       2
 License:       BSD/GPL
 Group:         Libraries
-Source0:       http://www.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-# Source0-md5: 481dfdef7273f2cc776c2637f481f017
+Source0:       http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
+# Source0-md5: db2152a8a03bd81e21a5f451f537ae3d
 Patch0:                %{name}-klcc.patch
 Patch1:                %{name}-kill_interp_sohash.patch
 URL:           http://www.zytor.com/mailman/listinfo/klibc/
 BuildRequires: bison
 BuildRequires: flex
-BuildRequires: linux-libc-headers >= 7:2.6.20
+BuildRequires: linux-libc-headers >= 7:2.6.24-1
 BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +42,7 @@ Summary(pl.UTF-8):    Pliki dla programistów klibc
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      binutils
-Requires:      linux-libc-headers >= 7:2.6.20
+Requires:      linux-libc-headers >= 7:2.6.24-1
 
 %description devel
 Small libc for building embedded applications - development files.
@@ -74,6 +74,20 @@ Utilities dynamically linked with klibc.
 %description utils-shared -l pl.UTF-8
 Narzędzia dynamicznie zlinkowane z klibc.
 
+%package utils-shared-debug
+Summary:       Utilities dynamically linked with klibc (unstripped)
+Summary(pl.UTF-8):     Narzędzia dynamicznie zlinkowane z klibc
+Group:         Base
+Requires:      %{name}-utils-shared = %{version}-%{release}
+
+%description utils-shared-debug
+Utilities dynamically linked with klibc.
+Programs in this package debugging information not stripped.
+
+%description utils-shared-debug -l pl.UTF-8
+Narzędzia dynamicznie zlinkowane z klibc.
+Programy zawarte w tym pakiecie zawierają informację dla debugera.
+
 %package utils-static
 Summary:       Utilities statically linked with klibc
 Summary(pl.UTF-8):     Narzędzia statycznie zlinkowane z klibc
@@ -81,9 +95,23 @@ Group:               Base
 
 %description utils-static
 Utilities staticly linked with klibc.
+Programs in this package debugging information not stripped.
 
 %description utils-static -l pl.UTF-8
 Narzędzia statycznie zlinkowane z klibc.
+Programy zawarte w tym pakiecie zawierają informację dla debugera.
+
+%package utils-static-debug
+Summary:       Utilities statically linked with klibc (unstripped)
+Summary(pl.UTF-8):     Narzędzia statycznie zlinkowane z klibc
+Group:         Base
+Requires:      %{name}-utils-static = %{version}-%{release}
+
+%description utils-static-debug
+Utilities staticly linked with klibc.
+
+%description utils-static-debug -l pl.UTF-8
+Narzędzia statycznie zlinkowane z klibc.
 
 %prep
 %setup -q
@@ -92,17 +120,15 @@ Narzędzia statycznie zlinkowane z klibc.
 
 %build
 cd usr/include
-ln -sf /usr/include/linux .
 ln -sf /usr/include/asm .
 ln -sf /usr/include/asm-generic .
-%ifarch %{x8664}
-ln -sf /usr/include/asm-i386 .
-ln -sf /usr/include/asm-x86_64 .
-%endif
 %ifarch sparc64
 ln -sf /usr/include/asm-sparc .
 ln -sf /usr/include/asm-sparc64 .
 %endif
+ln -sf /usr/include/linux .
+# early-userspace needs acces to e.g. uvesafb.h.
+ln -sf /usr/include/video .
 
 cd ../..
 install -d linux
@@ -140,6 +166,8 @@ install usr/kinit/*/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 install usr/utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
 install usr/utils/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 
+ln -s %{_libdir}/klibc/bin-shared $RPM_BUILD_ROOT%{_libdir}/klibc/bin
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -162,10 +190,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files utils-shared
 %defattr(644,root,root,755)
+%{_libdir}/klibc/bin
 %dir %{_libdir}/klibc/bin-shared
 %attr(755,root,root) %{_libdir}/klibc/bin-shared/*
+%exclude %{_libdir}/klibc/bin-shared/*.g
+
+%files utils-shared-debug
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/klibc/bin-shared/*.g
 
 %files utils-static
 %defattr(644,root,root,755)
 %dir %{_libdir}/klibc/bin-static
 %attr(755,root,root) %{_libdir}/klibc/bin-static/*
+%exclude %{_libdir}/klibc/bin-static/*.g
+
+%files utils-static-debug
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/klibc/bin-static/*.g