X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=5b760003bae914f9da70c7c4c8d40f62edf00d2d;hb=054867268a96d876cfd7a86abe0f201703b2e1ed;hp=ae210539e49eef17f82f0473220e6684eb97de93;hpb=479c8fe73af0db31121b45a44039af0cafd614b3;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index ae21053..5b76000 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,3 +1,4 @@
+%define		min_kernel	2.2.0
 Summary:	GNU libc
 Summary(de):	GNU libc
 Summary(fr):	GNU libc
@@ -5,7 +6,7 @@ Summary(pl):	GNU libc
 Summary(tr):	GNU libc
 name:		glibc
 Version:	2.2
-Release:	2
+Release:	7
 License:	LGPL
 Group:		Libraries
 Group(de):	Libraries
@@ -25,10 +26,12 @@ 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}-getxxxxinfo.patch
+Patch8:		%{name}-ldconfig.patch
+Patch9:		%{name}-getxxxxinfo.patch
 URL:		http://www.gnu.org/software/libc/
 BuildRequires:	perl
 BuildRequires:	gd-devel
+BuildRequires:	texinfo
 Provides:	ld.so.2
 Provides:	ldconfig
 Provides:	/sbin/ldconfig
@@ -37,6 +40,7 @@ Obsoletes:	%{name}-debug
 Obsoletes:	ldconfig
 Autoreq:	false
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Conflicts:	kernel < %{min_kernel}
 
 %description
 Contains the standard libraries that are used by multiple programs on
@@ -135,6 +139,7 @@ Group(de):	Netzwerkwesen/Server
 Group(pl):	Sieciowe/Serwery
 Prereq:		/sbin/chkconfig
 Requires:	rc-scripts >= 0.2.0
+Requires:	%{name} = %{version}
 
 %description -n nscd
 nscd caches name service lookups; it can dramatically improve
@@ -154,6 +159,7 @@ Summary(pl):	Kod 
 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
@@ -174,6 +180,7 @@ Summary(pl):	Program do konwersji plik
 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
@@ -302,8 +309,9 @@ Glibc NSS (Name Service Switch) module for NIS+ databases acces.
 
 %package memusage
 Summary:	A toy.
-Group:		Toys
-######		Unknown group!
+Group:		Applications
+Group(de):	Applikationen
+Group(pl):	Aplikacje
 Requires:	%{name} = %{version}
 Requires:	gd
 
@@ -320,12 +328,13 @@ A toy.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+%patch8 -p0
+%patch9 -p1
 
 %build
 %configure \
 	--enable-add-ons=linuxthreads \
-%{?kernel:--enable-kernel=%{kernel}} \
+	--enable-kernel="%{?kernel:%{kernel}}%{!?kernel:%{min_kernel}}" \
 	--enable-profile \
 	--disable-omitfp
 
@@ -335,11 +344,13 @@ A toy.
 rm -rf $RPM_BUILD_ROOT
 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
 
@@ -347,30 +358,30 @@ 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}
+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 ../..%{_libdir}/libbsd-compat.a $RPM_BUILD_ROOT%{_libdir}/libbsd.a
+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 %{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 %{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 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -404,6 +415,9 @@ 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
 
@@ -494,6 +508,7 @@ rm -rf $RPM_BUILD_ROOT
 %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)