X-Git-Url: http://git.pld-linux.org/?p=packages%2Fglibc.git;a=blobdiff_plain;f=glibc.spec;h=4fa1e16649a9e84105bb89513615f162a478a847;hp=f8b55bd92d842355ca315c068c022ef72f30efac;hb=2c6699cce59b0e8cfa5c5b924cecfa0729d6f101;hpb=fbb308934e16cb44950b652e1d01422a32633fda

diff --git a/glibc.spec b/glibc.spec
index f8b55bd..4fa1e16 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -5,7 +5,8 @@ Summary(pl):	GNU libc
 Summary(tr):	GNU libc
 name:		glibc
 Version:	2.1
-Release:	7
+%define		man_pages_ver 1.23
+Release:	10
 Copyright:	LGPL
 Group:		Libraries
 Group(pl):	Biblioteki
@@ -14,11 +15,12 @@ Source1:	ftp://sourceware.cygnus.com/pub/glibc/%{name}-linuxthreads-%{version}.t
 Source2:	http://www.ozemail.com.au/~geoffk/glibc-crypt/%{name}-crypt-%{version}.tar.gz
 Source3:	utmpd.init
 Source4:	nscd.init
+Source5:	ftp://ftp.win.tue.nl/pub/linux/docs/manpages/man-pages-%{man_pages_ver}.tar.bz2
 Patch0:		glibc-info.patch
 URL:		http://www.gnu.org/software/libc/
 Provides:	ld.so.2
-Obsoletes:	%{name}-profile
-Obsoletes:	%{name}-debug
+Obsoletes:	glibc-profile
+Obsoletes:	glibc-debug
 Autoreq:	false
 BuildRoot:	/tmp/%{name}-%{version}-root
 
@@ -70,7 +72,7 @@ C kitapl
 Linux sistemi çalýþmayacaktýr. Yerel dil desteði ve zaman dilimi veri tabaný
 da bu pakette yer alýr.
 
-%package	devel
+%package devel
 Summary:	Additional libraries required to compile
 Summary(de):	Weitere Libraries zum Kompilieren
 Summary(fr):	Librairies supplémentaires nécessaires à la compilation.
@@ -106,7 +108,7 @@ C kitapl
 geliþtirmek için gereken standart baþlýk dosyalarý ve statik kitaplýklar.
 
 %prep 
-%setup -q -a 1 -a 2
+%setup -q -a 1 -a 2 -a 5
 %patch -p1
 
 %build
@@ -119,8 +121,10 @@ sparc32 \
 	--enable-add-ons=crypt,linuxthreads \
 	--disable-profile \
 	--prefix=/usr \
-	--disable-omitfp
-make  
+	--disable-omitfp \
+	--enable-add-ons=yes \
+        %{_target}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -130,7 +134,9 @@ make install_root=$RPM_BUILD_ROOT install
 make install_root=$RPM_BUILD_ROOT install-locales -C localedata
 
 make -C linuxthreads/man
-install linuxthreads/man/*.3thr $RPM_BUILD_ROOT/usr/man/man3
+
+install linuxthreads/man/*.3thr man-pages-*/man3/* \
+	$RPM_BUILD_ROOT%{_mandir}/man3
 
 rm -rf $RPM_BUILD_ROOT/usr/share/zoneinfo/{localtime,posixtime,posixrules}
 
@@ -169,23 +175,20 @@ cp crypt/README documentation/README.crypt
 
 cp ChangeLog ChangeLog.8 documentation
 
-bzip2 -9 documentation/*
-
 strip $RPM_BUILD_ROOT/{sbin/*,usr/{bin/*,sbin/*}} || :
 
-bzip2 -9 README NEWS FAQ BUGS NOTES PROJECTS
-
-gzip -9fn $RPM_BUILD_ROOT/usr/{man/man*/*,info/libc*}
+gzip -9fn $RPM_BUILD_ROOT/usr/{man/man*/*,info/libc*} \
+	README NEWS FAQ BUGS NOTES PROJECTS documentation/*
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info /usr/info/libc.info.gz /etc/info-dir
+/sbin/install-info %{_infodir}/libc.info.gz /etc/info-dir
 
 %preun devel
 if [ "$1" = 0 ]; then
-	/sbin/install-info --delete /usr/info/libc.info.gz /etc/info-dir
+	/sbin/install-info --delete %{_infodir}/libc.info.gz /etc/info-dir
 fi
 
 %clean
@@ -193,7 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {README,NEWS,FAQ,BUGS}.bz2
+%doc {README,NEWS,FAQ,BUGS}.gz
 
 %attr(640,root,root) %config(noreplace) %verify(not mtime md5 size) /etc/nscd.*
 %config(noreplace) %verify(not mtime md5 size) /etc/nsswitch.conf
@@ -210,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir /usr/lib/gconv
 /usr/lib/gconv/gconv-modules
+%attr(755,root,root) /usr/lib/gconv/*.so
 
 /usr/share/i18n
 /usr/share/locale
@@ -220,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc documentation/* {NOTES,PROJECTS}.bz2
+%doc documentation/* {NOTES,PROJECTS}.gz
 
 /usr/include/*.h
 /usr/include/arpa
@@ -244,16 +248,25 @@ rm -rf $RPM_BUILD_ROOT
 /usr/include/scsi
 /usr/include/sys
 
-/usr/info/libc.inf*.gz
+%{_infodir}/libc.inf*.gz
 
 %attr(755,root,root) /usr/lib/lib*.so
 /usr/lib/*.o
 /usr/lib/lib*.a
 
-%attr(755,root,root) /usr/lib/gconv/*.so
-/usr/man/man3/*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Apr 19 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+  [2.1-10]
+- recompiled on new rpm.
+
+* Tue Mar 30 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+  [2.1-9]
+- gzipping %doc,
+- iconv modules moved to main,
+- moved man pages level 3 from man-pages package.
+
 * Mon Mar 15 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.
   [2.1-7]
 - on sparc{64} ./configure must be runed throw sparc32 wrapper.
@@ -332,9 +345,7 @@ rm -rf $RPM_BUILD_ROOT
   long to compile the full featured version on my home linux box ;)
 - compilation is now performed in compile directory as advised 
   in Glibc HOWTO,
-- start at invalid RH spec file.  
-
-
+- start at invalid RH spec file.
   [2.1.1-1]
 - based on RH spec,
 - spec rewrited by PLD team,