- BuildRequires gettext-devel >= 0.10.36

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 5fc2a7897f382627c8148eb99f107d792eb4af79..daf85eb0ee268a70ec7219aa5b9bb108831b62fb 100644 (file)
--- 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:       8
+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,17 +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
+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-11
 Provides:      ld.so.2
 Provides:      ldconfig
 Provides:      /sbin/ldconfig
-Obsoletes:     %{name}-profile
 Obsoletes:     %{name}-debug
 Obsoletes:     ldconfig
 Autoreq:       false
@@ -140,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
@@ -330,11 +333,13 @@ A toy.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p0
+%patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
+LDFLAGS=" " ; export LDFLAGS
 %configure \
        --enable-add-ons=linuxthreads \
        --enable-kernel="%{?kernel:%{kernel}}%{!?kernel:%{min_kernel}}" \
@@ -404,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
@@ -460,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
@@ -523,28 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*prof*
 %attr(755,root,root) %{_bindir}/*trace
 
-%{_includedir}/*.h
-%{_includedir}/arpa
-%{_includedir}/bits
-%{_includedir}/gnu
-%{_includedir}/net
-%{_includedir}/netash
-%{_includedir}/netatalk
-%{_includedir}/netax25
-%{_includedir}/neteconet
-%{_includedir}/netinet
-%{_includedir}/netipx
-%{_includedir}/netpacket
-%{_includedir}/netrom
-%{_includedir}/netrose
-%{_includedir}/nfs
-%{_includedir}/protocols
-%{_includedir}/rpc
-%{_includedir}/rpcsvc
-%{_includedir}/scsi
-%{_includedir}/sys
-
-%{_infodir}/libc.inf*.gz
+%{_includedir}/*
+
+%{_infodir}/libc.info*
 
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/*crt*.o
@@ -568,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