- added ia64

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 394932ea27329c0479909e0961c7aa8cc6157a45..8709777887fdcb61607a3d5811a61065a910b004 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -16,11 +16,6 @@
 # TODO:
 # - localedb-gen man pages(?)
 # - fix what trojan broke while upgreading (getaddrinfo-workaround)
-# - fix ld.so.conf (while upgrading glibc it do NOW mv ld.so.conf ld.so.conf.rpmsave)
-#
-# WARNING:
-#      posix zoneinfo dir removed, /etc/rc.d/init.d/timezone must be changed
-#      in order to use this version!
 #
 
 %{!?min_kernel:%global          min_kernel      2.4.6}
@@ -49,7 +44,7 @@
 %endif
 
 %define                llh_version     7:2.6.6.0
-%define                _snap           20040623
+%define                _snap           20040707
 
 Summary:       GNU libc
 Summary(de):   GNU libc
@@ -62,13 +57,13 @@ Summary(tr):        GNU libc
 Summary(uk):   GNU libc ×ÅÒÓ¦§ 2.3
 Name:          glibc
 Version:       2.3.4
-Release:       0.%{_snap}.1%{?with_nptl:+nptl}%{!?with_nptl:%{?with_tls:+tls}
+Release:       0.%{_snap}.1%{?with_nptl:+nptl}%{!?with_nptl:%{?with_tls:+tls}}
 Epoch:         6
 License:       LGPL
 Group:         Libraries
 #Source0:      ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
 Source0:       %{name}-%{_snap}.tar.bz2
-# Source0-md5: a3632078c6a578c135d352d017180c82
+# Source0-md5: 7768ef6077b979c52f3c3bfd6da20c53
 #Source1:      ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.bz2
 #Source1:      %{name}-linuxthreads-2.3.3.tar.bz2
 Source2:       nscd.init
@@ -104,10 +99,8 @@ Patch17:    %{name}-csu-quotes.patch
 Patch18:       %{name}-tests-noproc.patch
 Patch19:       %{name}-new-charsets.patch
 Patch20:       %{name}-sr_CS.patch
-Patch21:       %{name}-alpha-relro.patch
-Patch22:       %{name}-sparc64-dl-machine.patch
-Patch23:       %{name}-alpha-mq.patch
-Patch24:       %{name}-alpha-typo.patch
+Patch21:       %{name}-sparc64-dl-machine.patch
+Patch22:       %{name}-tzfile-noassert.patch
 # PaX
 Patch30:       %{name}-pax_iconvconfig.patch
 Patch31:       %{name}-pax_dl-execstack.patch
@@ -793,8 +786,6 @@ Statyczne 64-bitowe biblioteki GNU libc.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
-%patch24 -p1
 
 %patch30 -p1
 %patch31 -p1
@@ -1107,7 +1098,7 @@ fi
 %attr(755,root,root) %{_bindir}/getent
 %attr(755,root,root) %{_bindir}/iconv
 %attr(755,root,root) %{_bindir}/ldd
-%ifnarch alpha ppc sparc64 amd64
+%ifnarch alpha amd64 ia64 ppc sparc64
 %attr(755,root,root) %{_bindir}/lddlibc4
 %endif
 %attr(755,root,root) %{_bindir}/locale