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

diff --git a/glibc.spec b/glibc.spec
index 8108add..daf85eb 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,48 +1,51 @@
+%define		min_kernel	2.2.0
 Summary:	GNU libc
 Summary(de):	GNU libc
 Summary(fr):	GNU libc
 Summary(pl):	GNU libc
 Summary(tr):	GNU libc
 name:		glibc
-Version:	2.1.3
-Release:	16
+Version:	2.2.3
+Release:	2
 License:	LGPL
 Group:		Libraries
+Group(de):	Libraries
 Group(fr):	Librairies
 Group(pl):	Biblioteki
-Source0:	ftp://sourceware.cygnus.com/pub/glibc/%{name}-%{version}.tar.bz2
-Source1:	ftp://sourceware.cygnus.com/pub/glibc/%{name}-linuxthreads-%{version}.tar.gz
-Source2:	http://www.ozemail.com.au/~geoffk/glibc-crypt/%{name}-crypt-2.1.1.tar.gz
-Source3:	utmpd.init
-Source4:	nscd.init
-Source5:	utmpd.sysconfig
-Source6:	nscd.sysconfig
-Source7:	nscd.logrotate
-Source10:	ftp://ftp.yggdrasil.com/private/hjl/ldconfig-980708.tar.gz
-Source11:	ldconfig.8
-Patch0:		glibc-2.1-CVS-20000813.patch.bz2
-Patch1:		glibc-info.patch
-Patch2:		glibc-versions.awk_fix.patch
-Patch3:		glibc-pld.patch
-Patch4:		glibc-crypt-blowfish.patch
-Patch5:		glibc-string2-pointer-arith.patch
-Patch6:		glibc-db2-alpha-mutex.patch
-Patch7:		glibc-linuxthreads-lock.patch
-Patch8:		glibc-pthread_create-manpage.patch
-Patch9:		glibc-sparc-linux-chown.patch
-Patch10:	ldconfig-glibc.patch
-Patch11:	ldconfig-bklinks.patch
+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
+Source5:	ldconfig.8
+Patch0:		%{name}-info.patch
+Patch1:		%{name}-versions.awk_fix.patch
+Patch2:		%{name}-pld.patch
+Patch3:		%{name}-crypt-blowfish.patch
+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-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
-Prereq:		basesystem
 Autoreq:	false
+Prereq:		basesystem
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Conflicts:	kernel < %{min_kernel}
 
 %description
 Contains the standard libraries that are used by multiple programs on
@@ -102,6 +105,7 @@ Summary(fr):	Librairies suppl
 Summary(pl):	Dodatkowe biblioteki wymagane podczas kompilacji
 Summary(tr):	Geliþtirme için gerekli diðer kitaplýklar
 Group:		Development/Libraries
+Group(de):	Entwicklung/Libraries
 Group(fr):	Development/Librairies
 Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
@@ -132,69 +136,15 @@ C kitapl
 geliþtirmek için gereken standart baþlýk dosyalarý ve statik
 kitaplýklar.
 
-%package -n nss_compat
-Summary:	Old style NYS NSS glibc module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_compat
-Old style NYS NSS glibc module
-
-%package -n nss_db
-Summary:	Berkeley DB NSS glibc module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_db
-Berkeley DB NSS glibc module.
-
-%package -n nss_dns
-Summary:	BIND NSS glibc module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_dns
-BIND NSS glibc module.
-
-%package -n nss_files
-Summary:	Traditional files databases NSS glibc module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_files
-Traditional files databases NSS glibc module.
-
-%package -n nss_hesiod
-Summary:	Hesiod NSS glibc module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_hesiod
-Glibc NSS (Name Service Switch) module for databases acces.
-
-%package -n nss_nis
-Summary:	NIS(YP) NSS glibc module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_nis
-Glibc NSS (Name Service Switch) module for NIS(YP) databases acces.
-
-%package -n nss_nisplus
-Summary:	NIS+ NSS module
-Group:		Base
-Requires:	%{name} = %{version}
-
-%description -n nss_nisplus
-Glibc NSS (Name Service Switch) module for NIS+ databases acces.
-
 %package -n nscd
 Summary:	Name Service Caching Daemon
 Summary(pl):	Name Service Caching Daemon
 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
 nscd caches name service lookups; it can dramatically improve
@@ -208,28 +158,13 @@ drastycznie poprawi
 u¿ywanie nscd z j±drami serii 2.0.x z powodu b³adów po stronie j±dra w
 ods³udze w±tków.
 
-%package -n utmpd
-Summary:	utmp and utmpx synchronizer for libc5 applications.
-Summary(pl):	Synchrnnizuje zapis do plików utmp i utmpx.
-Group:		Daemons
-Group(pl):	Serwery
-Prereq:		/sbin/chkconfig
-Requires:	rc-scripts >= 0.2.0
-
-%description -n utmpd
-utmpd is a utmp and utmpx synchronizer. Is only needed for libc5 based
-program with utmp access.
-
-%description -n utmpd -l pl
-utmpd stara siê utrzymaæ tak± sam± zawarto¶æ plików /var/run/utmp i
-/var/run/utmpx. Potrzebny jest tylko w przypadku korzystania ze
-starszych programów (bazuj±cych na libc5).
-
 %package -n localedb-src
 Summary:	Souce code locale database
 Summary(pl):	Kod ¬ród³owy bazy locale
 Group:		Daemons
+Group(de):	Server
 Group(pl):	Serwery
+Requires:	%{name} = %{version}
 
 %description -n localedb-src
 This add-on package contains the data needed to build the locale data
@@ -248,7 +183,9 @@ wygenerowa
 Summary:	Convert encoding of given files from one encoding to another
 Summary(pl):	Program do konwersji plików tekstowych z jednego enkodingu w inny
 Group:		Daemons
+Group(de):	Server
 Group(pl):	Serwery
+Requires:	%{name} = %{version}
 
 %description -n iconv
 Convert encoding of given files from one encoding to another. You need
@@ -268,6 +205,7 @@ umo
 Summary:	Static libraries
 Summary(pl):	Biblioteki statyczne
 Group:		Development/Libraries
+Group(de):	Entwicklung/Libraries
 Group(fr):	Development/Librairies
 Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
@@ -284,6 +222,7 @@ Summary(de):	glibc mit Profil-Unterst
 Summary(fr):	glibc avec support pour profiling
 Summary(tr):	Ölçüm desteði olan glibc
 Group:		Development/Libraries/Libc
+Group(de):	Entwicklung/Libraries/Libc
 Group(pl):	Programowanie/Biblioteki/Libc
 Obsoletes:	libc-profile
 Requires:	%{name}-devel = %{version}
@@ -302,109 +241,90 @@ gprof kullan
 kitaplýðý kullanmak zorundadýrlar.
 
 %package pic
-Summary:        glibc PIC archive 
-Group:          Development/Libraries/Libc
-Group(pl):      Programowanie/Biblioteki/Libc
-Requires:       %{name}-devel = %{version}
+Summary:	glibc PIC archive 
+Group:		Development/Libraries/Libc
+Group(de):	Entwicklung/Libraries/Libc
+Group(pl):	Programowanie/Biblioteki/Libc
+Requires:	%{name}-devel = %{version}
 
 %description pic
-GNU C Library PIC archive contains an archive library (ar file) composed
-of individual shared objects. This is used for creating a library which
-is a smaller subset of the standard libc shared library.
-
-%package db1
-Summary:	BSD database library for C
-Group:		Libraries
-PreReq:		/sbin/ldconfig
-Provides:	db1
-
-%description db1
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-It should be installed if compatibility is needed with databases created with
-db1. This library used to be part of the glibc package.
+GNU C Library PIC archive contains an archive library (ar file)
+composed of individual shared objects. This is used for creating a
+library which is a smaller subset of the standard libc shared library.
 
-%package db1-devel
-Summary:	Development libraries and header files for Berkeley database library
-Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-db1 = %{version}
-Provides:	db1-devel
+%package -n nss_compat
+Summary:	Old style NYS NSS glibc module
+Group:		Base
+Group(de):	Gründsätzlich
+Group(pl):	Podstawowe
+Requires:	%{name} = %{version}
 
-%description db1-devel
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-Berkeley DB includes B tree, Hashing, Fixed and Variable-length record access
-methods.
+%description -n nss_compat
+Old style NYS NSS glibc module
 
-This package contains the header files, libraries, and documentation
-for building programs which use Berkeley DB.
+%package -n nss_dns
+Summary:	BIND NSS glibc module
+Group:		Base
+Group(de):	Gründsätzlich
+Group(pl):	Podstawowe
+Requires:	%{name} = %{version}
 
-%package db1-static
-Summary:	Static libraries for Berkeley database library
-Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-db1-devel = %{version}
-Provides:	db1-static
+%description -n nss_dns
+BIND NSS glibc module.
 
-%description db1-static
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-Berkeley DB includes B tree, Hashing, Fixed and Variable-length record access
-methods.
+%package -n nss_files
+Summary:	Traditional files databases NSS glibc module
+Group:		Base
+Group(de):	Gründsätzlich
+Group(pl):	Podstawowe
+Requires:	%{name} = %{version}
 
-This package contains the static libraries for building programs which use
-Berkeley DB.
+%description -n nss_files
+Traditional files databases NSS glibc module.
 
-%package db2
-Summary:	BSD database library for C
-Group:		Libraries
-PreReq:		/sbin/ldconfig
-Provides:	db2
+%package -n nss_hesiod
+Summary:	Hesiod NSS glibc module
+Group:		Base
+Group(de):	Gründsätzlich
+Group(pl):	Podstawowe
+Requires:	%{name} = %{version}
 
-%description db2
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This library used to be part of the glibc package.
+%description -n nss_hesiod
+Glibc NSS (Name Service Switch) module for databases acces.
 
-%package db2-devel
-Summary:	Development libraries and header files for Berkeley database library
-Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-db2 = %{version}
-Provides:	db2-devel
+%package -n nss_nis
+Summary:	NIS(YP) NSS glibc module
+Group:		Base
+Group(de):	Gründsätzlich
+Group(pl):	Podstawowe
+Requires:	%{name} = %{version}
 
-%description db2-devel
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-Berkeley DB includes B tree, Hashing, Fixed and Variable-length record access
-methods.
+%description -n nss_nis
+Glibc NSS (Name Service Switch) module for NIS(YP) databases acces.
 
-This package contains the header files, libraries, and documentation
-for building programs which use Berkeley DB.
+%package -n nss_nisplus
+Summary:	NIS+ NSS module
+Group:		Base
+Group(de):	Gründsätzlich
+Group(pl):	Podstawowe
+Requires:	%{name} = %{version}
 
-%package db2-static
-Summary:	Static libraries for Berkeley database library
-Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-db2-devel = %{version}
-Provides:	db2-static
+%description -n nss_nisplus
+Glibc NSS (Name Service Switch) module for NIS+ databases acces.
 
-%description db2-static
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-Berkeley DB includes B tree, Hashing, Fixed and Variable-length record access
-methods.
+%package memusage
+Summary:	A toy.
+Group:		Applications
+Group(de):	Applikationen
+Group(pl):	Aplikacje
+Requires:	%{name} = %{version}
+Requires:	gd
 
-This package contains the static libraries for building programs which use
-Berkeley DB.
+%description memusage
+A toy.
 
 %prep
-%setup -q -a 1 -a 2 -a 10
+%setup  -q -a 1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -415,31 +335,30 @@ Berkeley DB.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-cd ldconfig-980708
 %patch10 -p1
 %patch11 -p1
 
 %build
+LDFLAGS=" " ; export LDFLAGS
 %configure \
-	--enable-add-ons=crypt,linuxthreads \
+	--enable-add-ons=linuxthreads \
+	--enable-kernel="%{?kernel:%{kernel}}%{!?kernel:%{min_kernel}}" \
 	--enable-profile \
 	--disable-omitfp
 
 %{__make}
 
-cd ldconfig-980708
-rm -f ldconfig
-gcc -o ldconfig $RPM_OPT_FLAGS -D_LIBC -static ldconfig.c
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/{rc.d/init.d,sysconfig,logrotate.d},%{_mandir}/man{3,8},var/{db,log}}
+install -d $RPM_BUILD_ROOT/{etc/{rc.d/init.d,sysconfig,logrotate.d},%{_mandir}/man{3,8},var/log}
 
+env LANGUAGE=C LC_ALL=C  \
 %{__make} install \
 	install_root=$RPM_BUILD_ROOT \
 	infodir=%{_infodir} \
 	mandir=%{_mandir}
 
+env LANGUAGE=C LC_ALL=C  \
 %{__make} install-locales -C localedata \
 	install_root=$RPM_BUILD_ROOT
 
@@ -447,84 +366,69 @@ PICFILES="libc_pic.a libc.map
           math/libm_pic.a libm.map 
           resolv/libresolv_pic.a"
 
-install $PICFILES $RPM_BUILD_ROOT/%{_libdir}
-install elf/soinit.os $RPM_BUILD_ROOT/%{_libdir}/soinit.o
-install elf/sofini.os $RPM_BUILD_ROOT/%{_libdir}/sofini.o
+install $PICFILES				$RPM_BUILD_ROOT/%{_libdir}
+install elf/soinit.os				$RPM_BUILD_ROOT/%{_libdir}/soinit.o
+install elf/sofini.os				$RPM_BUILD_ROOT/%{_libdir}/sofini.o
+
+mv -f $RPM_BUILD_ROOT/lib/libmemusage.so	$RPM_BUILD_ROOT%{_libdir}
+mv -f $RPM_BUILD_ROOT/lib/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
 
 %{__make} -C linuxthreads/man
-install linuxthreads/man/*.3thr $RPM_BUILD_ROOT%{_mandir}/man3
+install linuxthreads/man/*.3thr			$RPM_BUILD_ROOT%{_mandir}/man3
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/{localtime,posixtime,posixrules}
 
-ln -sf ../../..%{_sysconfdir}/localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime
-ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
-ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
-ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_libdir}/libbsd.a
-ln -sf libdb.a $RPM_BUILD_ROOT%{_libdir}/libdb2.a
-ln -sf ../../lib/libdb.so.3 $RPM_BUILD_ROOT%{_libdir}/libdb2.so
-ln -sf libdb.so.3 $RPM_BUILD_ROOT/lib/libdb2.so.3
-
-%ifarch alpha
-ln -sf libdb.so.2.1 $RPM_BUILD_ROOT/lib/libdb.so.2
-%endif
+ln -sf ../../..%{_sysconfdir}/localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime
+ln -sf localtime				$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
+ln -sf localtime				$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
+ln -sf ../..%{_libdir}/libbsd-compat.a		$RPM_BUILD_ROOT%{_libdir}/libbsd.a
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
 
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/utmpd
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/nscd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/utmpd
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/nscd
-install nscd/nscd.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install nss/nsswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE2}		$RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
+install %{SOURCE3}		$RPM_BUILD_ROOT/etc/sysconfig/nscd
+install %{SOURCE4}		$RPM_BUILD_ROOT/etc/logrotate.d/nscd
+install nscd/nscd.conf		$RPM_BUILD_ROOT%{_sysconfdir}
+install nss/nsswitch.conf	$RPM_BUILD_ROOT%{_sysconfdir}
 
-install -s ldconfig-980708/ldconfig $RPM_BUILD_ROOT/sbin/ldconfig
 
-install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
+install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man8/
 touch	$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.{cache,conf}
 
-install nss/db-Makefile $RPM_BUILD_ROOT/var/db/Makefile
 :> $RPM_BUILD_ROOT/var/log/nscd
 
-cat << EOF > $RPM_BUILD_ROOT%{_bindir}/create-db
-#!/bin/sh
-/usr/bin/make -sC /var/db/
-EOF
-
-ln -sf create-db $RPM_BUILD_ROOT%{_bindir}/update-db
-
 rm -rf documentation
 install -d documentation
 
 cp linuxthreads/ChangeLog  documentation/ChangeLog.threads
 cp linuxthreads/Changes documentation/Changes.threads
 cp linuxthreads/README documentation/README.threads
-cp crypt/README documentation/README.crypt
-cp ldconfig-980708/README ldconfig-980708/README.ldconfig
+cp crypt/README.ufc-crypt documentation/
 
 cp ChangeLog ChangeLog.8 documentation
 
-gzip -9nf README NEWS FAQ BUGS NOTES PROJECTS \
-	$RPM_BUILD_ROOT{%{_mandir}/man*/*,%{_infodir}/libc*} \
-	documentation/* login/README.utmpd ldconfig-980708/README.ldconfig
+gzip -9nf README NEWS FAQ BUGS NOTES PROJECTS documentation/*
 
-strip $RPM_BUILD_ROOT/{sbin/*,usr/{sbin/*,bin/*}} ||:
-strip --strip-unneeded $RPM_BUILD_ROOT/lib/lib*.so.* \
-	$RPM_BUILD_ROOT%{_libdir}/gconv/*.so
+# 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/* ; do
+for i in $RPM_BUILD_ROOT%{_datadir}/locale/* $RPM_BUILD_ROOT%{_libdir}/locale/* ; do
 	if [ -d $i ]; then
-		lang=`echo $i | sed -e 's/.*locale\///' -e 's/^\(..\).*/\1/'`
+		lang=`echo $i | sed -e 's/.*locale\///' -e 's/\/.*//'`
 		dir=`echo $i | sed "s#$RPM_BUILD_ROOT##"`
 		echo "%lang($lang) $dir" >>glibc.lang
 	fi
+
 done
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post 	memusage -p /sbin/ldconfig
+%postun memusage -p /sbin/ldconfig
+
 %post devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
@@ -548,55 +452,30 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del nscd
 fi
 
-%post -n utmpd
-/sbin/chkconfig --add utmpd
-if [ -f /var/lock/subsys/utmpd ]; then
-	/etc/rc.d/init.d/utmpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/utmpd start\" to start utmpd daemon." 1>&2
-fi
-
-%preun -n utmpd
-if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/utmpd ]; then
-		/etc/rc.d/init.d/utmpd stop 1>&2
-	fi
-	/sbin/chkconfig --del utmpd
-fi
-
-%post db1  -p /sbin/ldconfig
-%postun db1 -p /sbin/ldconfig
-
-%post db2  -p /sbin/ldconfig
-%postun db2 -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f glibc.lang
 %defattr(644,root,root,755)
-%doc {README,NEWS,FAQ,BUGS,ldconfig-980708/README.ldconfig}.gz
+%doc {README,NEWS,FAQ,BUGS}.gz
 
 %config(noreplace) %verify(not mtime md5 size) %{_sysconfdir}/nsswitch.conf
-%config %{_sysconfdir}/rpc
-
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ld.so.conf
+%config %{_sysconfdir}/rpc
 %ghost %{_sysconfdir}/ld.so.cache
 
 %attr(755,root,root) /sbin/*
 %attr(755,root,root) %{_bindir}/catchsegv
-%attr(755,root,root) %{_bindir}/create-db
 %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
 %endif
 %attr(755,root,root) %{_bindir}/locale
-%attr(755,root,root) %{_bindir}/makedb
 %attr(755,root,root) %{_bindir}/rpcgen
 %attr(755,root,root) %{_bindir}/tzselect
-%attr(755,root,root) %{_bindir}/update-db
 
 %attr(755,root,root) %{_sbindir}/rpcinfo
 %attr(755,root,root) %{_sbindir}/zdump
@@ -607,16 +486,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /lib/libnsl*
 %attr(755,root,root) /lib/lib[BScmprtu]*
 
-%{_mandir}/man8/*
-
 %dir %{_datadir}/locale
 %{_datadir}/locale/locale.alias
 %{_datadir}/zoneinfo
 
-#%files -n nss_db
-%defattr(644,root,root,755)
-%attr(755,root,root) /lib/libnss_db*.so*
-%config /var/db/Makefile
+%dir %{_libdir}/locale
+
+%{_mandir}/man8/ldconfig*
 
 #%files -n nss_dns
 %defattr(644,root,root,755)
@@ -643,44 +519,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) /lib/libnss_nisplus*.so*
 
+%files memusage
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/memusage*
+%attr(755,root,root) %{_libdir}/libmemusage*
+
 %files devel
 %defattr(644,root,root,755)
 %doc documentation/* {NOTES,PROJECTS}.gz
 %attr(755,root,root) %{_bindir}/gencat
 %attr(755,root,root) %{_bindir}/getconf
-%attr(755,root,root) %{_bindir}/mtrace
-%attr(755,root,root) %{_bindir}/sprof
-
-%{_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
-
-%attr(755,root,root) %{_libdir}/lib[A-Z]*.so
-%attr(755,root,root) %{_libdir}/libc*.so
-%attr(755,root,root) %{_libdir}/libdl*.so
-%attr(755,root,root) %{_libdir}/libm*.so
-%attr(755,root,root) %{_libdir}/libns*.so
-%attr(755,root,root) %{_libdir}/lib[p-z]*.so
-%attr(755,root,root) %{_libdir}/*.o
+%attr(755,root,root) %{_bindir}/*prof*
+%attr(755,root,root) %{_bindir}/*trace
+
+%{_includedir}/*
+
+%{_infodir}/libc.info*
+
+%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/*crt*.o
 %{_libdir}/libc_nonshared.a
 
 %{_mandir}/man3/*
@@ -690,17 +547,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/nscd
 %attr(640,root,root) %config(noreplace) %verify(not mtime md5 size) %{_sysconfdir}/nscd.*
 %attr(754,root,root) /etc/rc.d/init.d/nscd
-%attr(755,root,root) %{_sbindir}/nscd
+%attr(755,root,root) %{_sbindir}/nscd*
 %attr(640,root,root) /etc/logrotate.d/nscd
 %attr(640,root,root) %ghost /var/log/nscd
 
-%files -n utmpd
-%defattr(644,root,root,755)
-%doc login/README.utmpd.gz
-%attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/utmpd
-%attr(754,root,root) /etc/rc.d/init.d/utmpd
-%attr(755,root,root) %{_sbindir}/utmpd
-
 %files -n localedb-src
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/localedef
@@ -708,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
@@ -726,7 +575,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libm.a
 %{_libdir}/libmcheck.a
 %{_libdir}/libnsl.a
-%{_libdir}/libposix.a
 %{_libdir}/libpthread.a
 %{_libdir}/libresolv.a
 %{_libdir}/librpcsvc.a
@@ -735,17 +583,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files profile
 %defattr(644,root,root,755)
-%{_libdir}/libBrokenLocale_p.a
-%{_libdir}/libc_p.a
-%{_libdir}/libcrypt_p.a
-%{_libdir}/libdl_p.a
-%{_libdir}/libm_p.a
-%{_libdir}/libnsl_p.a
-%{_libdir}/libpthread_p.a
-%{_libdir}/libresolv_p.a
-%{_libdir}/librpcsvc_p.a
-%{_libdir}/librt_p.a
-%{_libdir}/libutil_p.a
+%{_libdir}/lib*_p.a
 
 %files pic
 %defattr(644,root,root,755)
@@ -753,48 +591,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.map
 %{_libdir}/soinit.o
 %{_libdir}/sofini.o
-
-%files db1
-%defattr(644,root,root,755)
-%attr(755,root,root) /lib/libdb1*
-%attr(755,root,root) /lib/libdb.so.2
-%ifarch alpha
-%attr(755,root,root) /lib/libdb.so.2.1
-%endif
-
-%files db1-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/db_dump185
-%attr(755,root,root) %{_libdir}/libdb1.so
-%{_includedir}/db1
-
-%files db1-static
-%defattr(644,root,root,755)
-%{_libdir}/libdb1.a
-
-%files db2
-%defattr(644,root,root,755)
-%attr(755,root,root) /lib/libdb-*
-%attr(755,root,root) /lib/libdb.so.3
-%attr(755,root,root) /lib/libdb2.so.3
-
-%files db2-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/db_archive
-%attr(755,root,root) %{_bindir}/db_checkpoint
-%attr(755,root,root) %{_bindir}/db_deadlock
-%attr(755,root,root) %{_bindir}/db_dump
-%attr(755,root,root) %{_bindir}/db_load
-%attr(755,root,root) %{_bindir}/db_printlog
-%attr(755,root,root) %{_bindir}/db_recover
-%attr(755,root,root) %{_bindir}/db_stat
-%attr(755,root,root) %{_libdir}/libdb.so
-%attr(755,root,root) %{_libdir}/libdb2.so
-%attr(755,root,root) %{_libdir}/libndbm.so
-%{_includedir}/db*.h
-
-%files db2-static
-%defattr(644,root,root,755)
-%{_libdir}/libdb.a
-%{_libdir}/libdb2.a
-%{_libdir}/libndbm.a