X-Git-Url: http://git.pld-linux.org/?p=packages%2Fglibc.git;a=blobdiff_plain;f=glibc.spec;h=c51d4b226e851f3a7cb3a5417c8b9027485f6a93;hp=f27e2f8c07291961aa6f1492387d7712916a3d8a;hb=2fb11e2;hpb=955a20e8a5be7c6cf67ec5dec15c0bea0430d906

diff --git a/glibc.spec b/glibc.spec
index f27e2f8..c51d4b2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,5 +1,5 @@
 # TODO:
-# - use syslog.2 from here and not from man-pages
+# - consider moving klogctl.3 man to man-pages (and drop syslog.2 stub hacks here)
 # - restore --with-pkgversion when tcl upstream fixes the #3599098 (broken platform::identify).
 # - --enable-systemtap
 # - look at locale fixes/updates in bugzilla
@@ -51,7 +51,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	1
+Release:	4
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -62,7 +62,7 @@ Source3:	nscd.sysconfig
 Source4:	nscd.logrotate
 # from man-pages.spec --with tars
 Source5:	%{name}-man-pages.tar.xz
-# Source5-md5:	e66023386d2cc0d6a1d5c29bdbf03550
+# Source5-md5:	4481fa9cbead3fe9d24af66666db1c86
 Source6:	%{name}-localedb-gen
 Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
@@ -161,7 +161,7 @@ ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # errno, ps_*, __resp, __h_errno symbols
-%define		skip_post_check_so	libm.so.6 libc_malloc_debug.so.0 libcrypt.so.1 libthread_db.so.1 libresolv.so.2 libnss_db.so.2 libnss_compat.so.2 libnss_hesiod.so.2 libnsl.so.1
+%define		skip_post_check_so	libm.so.6 libc_malloc_debug.so.0 libcrypt.so.1 libthread_db.so.1 libresolv.so.2 libnss_db.so.2 libnss_compat.so.2 libnss_hesiod.so.2 libnsl.so.1 librt.so.1
 
 # avoid -s here (ld.so must not be stripped to allow any program debugging)
 %define		filterout_ld		(-Wl,)?-[sS] (-Wl,)?--strip.*
@@ -1078,11 +1078,11 @@ PICFILES="libc_pic.a libc.map
 	math/libm_pic.a libm.map
 	resolv/libresolv_pic.a"
 
-install -p $PICFILES				$RPM_BUILD_ROOT%{_libdir}
-install -p elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
+install -p $PICFILES		$RPM_BUILD_ROOT%{_libdir}
+install -p elf/sofini.os	$RPM_BUILD_ROOT%{_libdir}/sofini.o
 
 # Include %{_libdir}/gconv/gconv-modules.cache
-$(pwd)/elf/ld.so --library-path $(pwd) ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
+:> $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
 cd ..
 
 %if %{without cross}
@@ -1412,13 +1412,15 @@ if [ "$1" = "0" ]; then
 	%groupremove nscd
 fi
 
+%posttrans -n iconv
+%{_sbindir}/iconvconfig --nostdlib -o %{_libdir}/gconv/gconv-modules.cache %{_libdir}/gconv
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README NEWS
 %if %{without cross}
 %attr(755,root,root) /sbin/glibc-postinst
 %endif
-# TODO: package ldconfig symlinks as %ghost
 %ifarch %{ix86} sparc sparcv9 sparc64 alpha sh
 %attr(755,root,root) /%{_lib}/ld-linux.so.2
 %endif
@@ -1795,9 +1797,9 @@ fi
 %files libcrypt
 %defattr(644,root,root,755)
 %ifarch alpha
-%attr(755,root,root) %ghost /%{_lib}/libcrypt.so.1.1
+%attr(755,root,root) /%{_lib}/libcrypt.so.1.1
 %else
-%attr(755,root,root) %ghost /%{_lib}/libcrypt.so.1
+%attr(755,root,root) /%{_lib}/libcrypt.so.1
 %endif
 %endif
 
@@ -1861,13 +1863,9 @@ fi
 # empty archives, so linking with obsolete -lXX (these below) works
 %{_libdir}/libanl.a
 %{_libdir}/libdl.a
-%{_libdir}/libdl_p.a
 %{_libdir}/libpthread.a
-%{_libdir}/libpthread_p.a
 %{_libdir}/librt.a
-%{_libdir}/librt_p.a
 %{_libdir}/libutil.a
-%{_libdir}/libutil_p.a
 %{_libdir}/crt[1in].o
 %{_libdir}/[MSgr]crt1.o
 %{?with_static_pie:%{_libdir}/grcrt1.o}
@@ -1932,6 +1930,7 @@ fi
 %doc documentation/*
 %{_infodir}/libc.info*
 
+%{_mandir}/man2/getcwd.2*
 %{_mandir}/man3/*
 %{_mandir}/man7/aio.7*
 %{_mandir}/man7/attributes.7*
@@ -1944,9 +1943,11 @@ fi
 %{_mandir}/man7/nptl.7*
 %{_mandir}/man7/posixoptions.7*
 %{_mandir}/man7/pthreads.7*
+%{_mandir}/man7/queue.7*
 %{_mandir}/man7/rtld-audit.7*
 %{_mandir}/man7/sem_overview.7*
 %{_mandir}/man7/shm_overview.7*
+%{_mandir}/man7/system_data_types.7*
 %lang(cs) %{_mandir}/cs/man3/*
 %lang(de) %{_mandir}/de/man3/*
 %lang(es) %{_mandir}/es/man3/*
@@ -1967,6 +1968,7 @@ fi
 %lang(hu) %{_mandir}/hu/man3/*
 %lang(it) %{_mandir}/it/man3/*
 %lang(it) %{_mandir}/it/man7/glob.7*
+%lang(ja) %{_mandir}/ja/man2/getcwd.2*
 %lang(ja) %{_mandir}/ja/man3/*
 %lang(ja) %{_mandir}/ja/man7/aio.7*
 %lang(ja) %{_mandir}/ja/man7/complex.7*
@@ -2008,12 +2010,27 @@ fi
 
 %files profile
 %defattr(644,root,root,755)
-%{_libdir}/lib*_p.a
+%{_libdir}/libBrokenLocale_p.a
+%{_libdir}/libanl_p.a
+%{_libdir}/libc_p.a
+%{?with_crypt:%{_libdir}/libcrypt_p.a}
+%{_libdir}/libdl_p.a
+%{_libdir}/libm_p.a
+%ifarch %{x8664} x32
+%{_libdir}/libmvec_p.a
+%endif
+%{_libdir}/libpthread_p.a
+%{_libdir}/libresolv_p.a
+%{_libdir}/librt_p.a
+%{_libdir}/libutil_p.a
 
 %files pic
 %defattr(644,root,root,755)
-%{_libdir}/lib*_pic.a
-%{_libdir}/lib*.map
+%{_libdir}/libc_pic.a
+%{_libdir}/libm_pic.a
+%{_libdir}/libresolv_pic.a
+%{_libdir}/libc.map
+%{_libdir}/libm.map
 %{_libdir}/sofini.o
 
 %files -n nscd
@@ -2066,7 +2083,7 @@ fi
 %dir %{_libdir}/gconv
 %{_libdir}/gconv/gconv-modules
 %dir %{_libdir}/gconv/gconv-modules.d
- %{_libdir}/gconv/gconv-modules.d/gconv-modules-extra.conf
+%{_libdir}/gconv/gconv-modules.d/gconv-modules-extra.conf
 %verify(not md5 mtime size) %{_libdir}/gconv/gconv-modules.cache
 %attr(755,root,root) %{_libdir}/gconv/*.so
 %{_mandir}/man8/iconvconfig.8*