- added patch for possible integer overflow in xdrmem functions

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index 961806fab577d6174d2eaaa6ec96291f9491c150..90b800ff78ec0523e94fa01b1e3ec21292d2037e 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,17 +1,24 @@
 Summary:       C library optimized for size
 Summary(pl):   Biblioteka standardowa C zoptymalizowana na rozmiar
-Summary(pt_BR): libc pequena otimizada para tamanho
+Summary(pt_BR):        libc pequena otimizada para tamanho
 Name:          dietlibc
-Version:       0.19
-Release:       1
+Version:       0.22
+Release:       3
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
-Source0:       http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2
+Source0:       http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
+# Source0-md5: 877b12ab0b2bbff340095cf2cf074418
 Patch0:                %{name}-ppc.patch
+Patch1:                %{name}-opt.patch
+Patch2:                %{name}-xdrmem-overflow.patch
 URL:           http://www.fefe.de/dietlibc/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                dietprefix      %{_prefix}/%{_target_cpu}-linux-dietlibc
+# for some reason known only to rpm there must be "\\|" not "\|" here
+%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon/i386/')
+
 %description
 Small libc for building embedded applications.
 
@@ -19,15 +26,15 @@ Small libc for building embedded applications.
 Niewielka libc do budowania aplikacji wbudowanych.
 
 %description -l pt_BR
-A diet libc e' uma libc otimizada para criar pequenos binários estaticamente
-linkados para Linux%package devel.
+A diet libc e' uma libc otimizada para criar pequenos binários
+estaticamente linkados para Linux.
 
 %package devel
 Summary:       Development files for dietlibc
 Summary(pl):   Pliki dla programistów u¿ywaj±cych dietlibc
-Summary(pt_BR): libc pequena otimizada para tamanho
+Summary(pt_BR):        libc pequena otimizada para tamanho
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description devel
 Small libc for building embedded applications - development files.
@@ -40,7 +47,7 @@ programist
 Summary:       Static libraries for dietlibc
 Summary(pl):   Biblioteki statyczne dla dietlibc
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}
 
 %description static
 Small libc for building embedded applications - static libraries.
@@ -50,33 +57,41 @@ Niewielka libc do budowania aplikacji wbudowanych - biblioteki
 statyczne.
 
 %prep
-%setup -q 
-%patch -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%define dietprefix %{_prefix}/%{_arch}-linux-dietlibc
-%{__make} prefix=%{dietprefix} all dyn
+OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
+%ifarch sparc sparcv9
+sparc32 \
+%endif
+%{__make} prefix=%{dietprefix} all
+%ifarch %{ix86}
+%{__make} prefix=%{dietprefix} dyn
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT prefix=%{dietprefix}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       prefix=%{dietprefix}
 
 mv $RPM_BUILD_ROOT%{dietprefix}/bin/* $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{dietprefix}/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 rm -rf $RPM_BUILD_ROOT%{dietprefix}/{bin,man}
 rm -f $RPM_BUILD_ROOT%{_bindir}/diet-dyn
 
-cat > $RPM_BUILD_ROOT%{_bindir}/%{_arch}-dietlibc-gcc <<EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<EOF
 #!/bin/sh
 exec %{_bindir}/diet gcc "\$@"
 EOF
 
 rm -rf $RPM_BUILD_ROOT%{dietprefix}/include/{asm,linux}
 
-gzip -9nf TODO README THANKS CAVEAT CHANGES FAQ BUGS AUTHOR
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,17 +99,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc TODO README THANKS CAVEAT CHANGES FAQ BUGS AUTHOR
 %dir %{dietprefix}
-%dir %{dietprefix}/lib-%{_arch}
-%attr(755,root,root) %{dietprefix}/lib-%{_arch}/*.so
+%dir %{dietprefix}/lib-%{libarch}
+%ifarch %{ix86}
+%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.so
 %{_sysconfdir}/*
+%endif
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{dietprefix}/include
-%attr(755,root,root) %{dietprefix}/lib-%{_arch}/*.o
+%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.o
 %{_mandir}/man*/*
 
 %files static
 %defattr(644,root,root,755)
-%{dietprefix}/lib-%{_arch}/*.a
+%{dietprefix}/lib-%{libarch}/*.a