- BR: perl-modules

[packages/klibc.git] / klibc.spec

diff --git a/klibc.spec b/klibc.spec
index e1bb973b488e97b2c84e636602def3925052459b..1ff0d5d0aa497ce29d97b0d9b711dcb2343abf1e 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,4 +1,8 @@
 #
+# TODO:
+#    - warning: Installed (but unpackaged) file(s) found:
+#               /usr/lib/klibc/libc.so.hash
+#
 # Conditional build:
 %bcond_without dist_kernel     # build without distribution kernel-headers
 %bcond_with    verbose         # verbose build
@@ -6,20 +10,20 @@
 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.8
+Version:       1.5.18
 Release:       1
 License:       BSD/GPL
 Group:         Libraries
-Source0:       http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.tar.bz2
-# Source0-md5: 20f33e4a1b1a3fab754335d66b930f9c
+Source0:       http://www.kernel.org/pub/linux/libs/klibc/Current/%{name}-%{version}.tar.bz2
+# Source0-md5: 5c8b6577b9acb3809cace6e118cdd55b
 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.24-1
-BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: perl-base
+BuildRequires: perl-modules
+BuildRequires: rpmbuild(macros) >= 1.153
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -74,6 +78,22 @@ 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 (z informacjami dla debuggera)
+Group:         Base
+Requires:      %{name}-utils-shared = %{version}-%{release}
+
+%description utils-shared-debug
+Utilities dynamically linked with klibc.
+
+Programs in this package have debugging information not stripped.
+
+%description utils-shared-debug -l pl.UTF-8
+Narzędzia dynamicznie zlinkowane z klibc.
+
+Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
+
 %package utils-static
 Summary:       Utilities statically linked with klibc
 Summary(pl.UTF-8):     Narzędzia statycznie zlinkowane z klibc
@@ -85,10 +105,25 @@ Utilities staticly linked with klibc.
 %description utils-static -l pl.UTF-8
 Narzędzia statycznie zlinkowane z klibc.
 
+%package utils-static-debug
+Summary:       Utilities statically linked with klibc (unstripped)
+Summary(pl.UTF-8):     Narzędzia statycznie zlinkowane z klibc (z informacjami dla debuggera)
+Group:         Base
+Requires:      %{name}-utils-static = %{version}-%{release}
+
+%description utils-static-debug
+Utilities staticly linked with klibc.
+
+Programs in this package have debugging information not stripped.
+
+%description utils-static-debug -l pl.UTF-8
+Narzędzia statycznie zlinkowane z klibc.
+
+Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 cd usr/include
@@ -128,7 +163,7 @@ cp -a usr/include/* $RPM_BUILD_ROOT%{_includedir}/klibc
 install klcc/klcc -D $RPM_BUILD_ROOT%{_bindir}/klcc
 install klcc/klcc.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/klcc.1
 install usr/klibc/libc.* usr/klibc/arch/%{_target_base_arch}/crt0.o usr/klibc/interp.o $RPM_BUILD_ROOT%{_libdir}/klibc
-install usr/klibc/klibc.so $RPM_BUILD_ROOT/%{_lib}
+install usr/klibc/klibc-*.so $RPM_BUILD_ROOT/%{_lib}
 install usr/dash/sh.shared $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared/sh
 install usr/dash/sh.shared.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared/sh.g
 install usr/dash/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static/sh
@@ -138,12 +173,14 @@ 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
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/klibc.so
+%attr(755,root,root) /%{_lib}/klibc-*.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -160,10 +197,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