X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=daf85eb0ee268a70ec7219aa5b9bb108831b62fb;hb=29f12ae8fd41d4e66ffc820e18b03562606491b7;hp=a163f6d85f1e05bd20361889501cdf99534ebc79;hpb=d9c9907751c142dde421684242662dc4029c55a4;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index a163f6d..daf85eb 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -5,15 +5,15 @@ Summary(fr):	GNU libc
 Summary(pl):	GNU libc
 Summary(tr):	GNU libc
 name:		glibc
-Version:	2.2
-Release:	11
+Version:	2.2.3
+Release:	2
 License:	LGPL
 Group:		Libraries
 Group(de):	Libraries
 Group(fr):	Librairies
 Group(pl):	Biblioteki
-Source0:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
-Source1:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.bz2
+Source0:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.gz
+Source1:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.gz
 Source2:	nscd.init
 Source3:	nscd.sysconfig
 Source4:	nscd.logrotate
@@ -26,21 +26,20 @@ Patch4:		%{name}-string2-pointer-arith.patch
 Patch5:		%{name}-linuxthreads-lock.patch
 Patch6:		%{name}-pthread_create-manpage.patch
 Patch7:		%{name}-sparc-linux-chown.patch
-Patch8:		%{name}-ldconfig.patch
-Patch9:		%{name}-getxxxxinfo.patch
-Patch10:	%{name}-flexiblearray.patch
-Patch11:	%{name}-unsecvars.patch
-Patch12:	%{name}-memusage.patch
+Patch8:		%{name}-ldconfig-bklinks.patch
+Patch9:		%{name}-getconf.patch
+Patch10:	%{name}-confname.patch
+Patch11:	%{name}-nis.patch
 URL:		http://www.gnu.org/software/libc/
 BuildRequires:	perl
 BuildRequires:	gd-devel
 BuildRequires:	libpng-devel
+BuildRequires:	gettext-devel >= 0.10.36
 BuildRequires:	texinfo
-BuildRequires:	rpm-build >= 4.0-9
+BuildRequires:	rpm-build >= 4.0-11
 Provides:	ld.so.2
 Provides:	ldconfig
 Provides:	/sbin/ldconfig
-Obsoletes:	%{name}-profile
 Obsoletes:	%{name}-debug
 Obsoletes:	ldconfig
 Autoreq:	false
@@ -144,7 +143,7 @@ Group:		Networking/Daemons
 Group(de):	Netzwerkwesen/Server
 Group(pl):	Sieciowe/Serwery
 Prereq:		/sbin/chkconfig
-Requires:	rc-scripts >= 0.2.0
+Prereq:		rc-scripts >= 0.2.0
 Requires:	%{name} = %{version}
 
 %description -n nscd
@@ -334,13 +333,13 @@ A toy.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p0
+%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 %build
+LDFLAGS=" " ; export LDFLAGS
 %configure \
 	--enable-add-ons=linuxthreads \
 	--enable-kernel="%{?kernel:%{kernel}}%{!?kernel:%{min_kernel}}" \
@@ -410,6 +409,9 @@ cp ChangeLog ChangeLog.8 documentation
 
 gzip -9nf README NEWS FAQ BUGS NOTES PROJECTS documentation/*
 
+# strip ld.so with --strip-debug only (other ELFs are stripped by rpm):
+%{!?debug:strip -g -R .comment -R .note $RPM_BUILD_ROOT/lib/ld-%{version}.so}
+
 # Collect locale files and mark them with %%lang()
 rm -f glibc.lang
 for i in $RPM_BUILD_ROOT%{_datadir}/locale/* $RPM_BUILD_ROOT%{_libdir}/locale/* ; do
@@ -466,6 +468,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/catchsegv
 %attr(755,root,root) %{_bindir}/getent
 %attr(755,root,root) %{_bindir}/glibcbug
+%attr(755,root,root) %{_bindir}/iconv
 %attr(755,root,root) %{_bindir}/ldd
 %ifnarch alpha
 %attr(755,root,root) %{_bindir}/lddlibc4
@@ -555,7 +558,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n iconv
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/iconv
 %dir %{_libdir}/gconv
 %{_libdir}/gconv/gconv-modules
 %attr(755,root,root) %{_libdir}/gconv/*.so