X-Git-Url: http://git.pld-linux.org/?p=packages%2Fklibc.git;a=blobdiff_plain;f=klibc.spec;h=94f803ec28326c13fc2a10ba4a7ebefad7190b7a;hp=70c3f08f3e6bd8b9a47a884f3560e0a8727cf8f1;hb=8d7c3cd9972811455a66197f944cab3cf6645a2a;hpb=b8016b7e5c62f7a46c37acd744d9bd0764a72ad1

diff --git a/klibc.spec b/klibc.spec
index 70c3f08..94f803e 100644
--- a/klibc.spec
+++ b/klibc.spec
@@ -10,14 +10,15 @@
 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.24
+Version:	2.0.8
 Release:	1
 License:	BSD/GPL
 Group:		Libraries
-Source0:	http://www.kernel.org/pub/linux/libs/klibc/Current/%{name}-%{version}.tar.bz2
-# Source0-md5:	4df9b0d3d7f9f366c4b5c171cac3c6c3
+Source0:	https://www.kernel.org/pub/linux/libs/klibc/2.0/%{name}-%{version}.tar.xz
+# Source0-md5:	bdd05bf16fce534e7a49d98644cdec87
 Patch0:		%{name}-klcc.patch
-URL:		http://www.zytor.com/mailman/listinfo/klibc/
+Patch1:		aligned_u64.patch
+URL:		https://lists.zytor.com/klibc/
 # ld.bfd binary
 BuildRequires:	binutils >= 2.20.51.0.6
 BuildRequires:	bison
@@ -26,6 +27,8 @@ BuildRequires:	linux-libc-headers >= 7:2.6.24-1
 BuildRequires:	perl-base
 BuildRequires:	perl-modules
 BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -126,6 +129,7 @@ Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p2
 
 %build
 cd usr/include
@@ -168,10 +172,11 @@ 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/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
-install usr/dash/sh.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static/sh.g
+install usr/dash/shared/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
+install usr/dash/shared/sh.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
+install usr/dash/static/sh $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
+install usr/dash/static/sh.g $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
+install usr/gzip/{gunzip,gzip,gzip.g,zcat} $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 install usr/kinit/*/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared
 install usr/kinit/*/static/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-static
 install usr/utils/shared/* $RPM_BUILD_ROOT%{_libdir}/klibc/bin-shared