X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dietlibc.spec;h=d43e9258ed08208c51885bf9db87462920e2f63d;hb=3c8e634da3ea8b42b1312e9c0109b75447e44bc3;hp=97d7155638693d7a34441402cfd796c265cccde8;hpb=96cac672a7a13f8245c2fcd8c7d64b013035b851;p=packages%2Fdietlibc.git

diff --git a/dietlibc.spec b/dietlibc.spec
index 97d7155..d43e925 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -6,13 +6,13 @@ Summary:	C library optimized for size
 Summary(pl.UTF-8):	Biblioteka standardowa C zoptymalizowana na rozmiar
 Summary(pt_BR.UTF-8):	libc pequena otimizada para tamanho
 Name:		dietlibc
-Version:	0.30
-Release:	4
+Version:	0.31
+Release:	5
 Epoch:		2
 License:	GPL v2
 Group:		Development/Libraries
 Source0:	http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
-# Source0-md5:	2465d652fff6f1fad3da3b98e60e83c9
+# Source0-md5:	acb98d469ee932d902fdf6de07802b7c
 Patch0:		%{name}-ppc.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-platform.patch
@@ -27,6 +27,8 @@ Patch9:		%{name}-stackgap-instead-of-ssp.patch
 Patch10:	%{name}-fflush-null.patch
 Patch11:	%{name}-_syscall-no-arch.patch
 Patch12:	%{name}-noexecstacks.patch
+Patch13:	%{name}-strcoll.patch
+Patch14:	%{name}-cvs.patch
 URL:		http://www.fefe.de/dietlibc/
 %ifarch sparc sparcv9
 BuildRequires:	sparc32
@@ -76,6 +78,7 @@ statyczne.
 
 %prep
 %setup -q
+%patch14 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -89,17 +92,18 @@ statyczne.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
 %ifarch sparc sparcv9
 sparc32 \
 %endif
-%{__make} all \
+%{__make} -j1 all \
 	prefix=%{dietprefix} \
 	CC="%{__cc}"
 %ifarch %{ix86}
-%{__make} dyn \
+%{__make} -j1 dyn \
 	prefix=%{dietprefix} \
 	CC="%{__cc}"
 %endif
@@ -125,8 +129,6 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<EOF
 exec %{_bindir}/diet gcc "\$@"
 EOF
 
-rm -rf $RPM_BUILD_ROOT%{dietprefix}/include/{asm,linux}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -137,15 +139,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dietprefix}/lib-%{libarch}
 %ifarch %{ix86}
 %attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.so
-%{_sysconfdir}/*
+%{_sysconfdir}/diet.ld.conf
 %endif
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/*-dietlibc-gcc
+%attr(755,root,root) %{_bindir}/diet
+%attr(755,root,root) %{_bindir}/dnsd
+%attr(755,root,root) %{_bindir}/elftrunc
+%{dietprefix}/lib-%{libarch}/*.o
 %{dietprefix}/include
-%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.o
-%{_mandir}/man*/*
+%{_mandir}/man1/diet.1*
 
 %files static
 %defattr(644,root,root,755)