This commit was manufactured by cvs2git to create branch 'GLIBC_2_14'.

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 222a162ffe26bbe2831cdc10e10d08a24e3fd601..08819737a7a4c978826c39676abe2efff00c78cf 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -19,7 +19,7 @@
 %undefine      with_memusage
 %endif
 
-%define                ports_version   2.13
+%define                ports_version   2.14.1
 %define                llh_version     7:2.6.20.4-1
 
 Summary:       GNU libc
@@ -32,15 +32,15 @@ Summary(ru.UTF-8):  GNU libc версии
 Summary(tr.UTF-8):     GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
-Version:       2.14
-Release:       16
+Version:       2.14.1
+Release:       4
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 8f5f6b09f98d17c630819b4845e31e65
-Source1:       http://ftp.gnu.org/gnu/glibc/%{name}-ports-%{ports_version}.tar.bz2
-# Source1-md5: 483f37cfdd619e81d8ca9e9d713944b5
+# Source0-md5: 55501b8d037a4f1d330312b30fd6d4bc
+Source1:       http://ftp.gnu.org/gnu/glibc/%{name}-ports-%{ports_version}.tar.xz
+# Source1-md5: 3b3afcb6b99fea9e3a2474cc4778ec88
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -85,8 +85,8 @@ Patch37:      0061_all_glibc-2.13-static-memset.patch
 Patch38:       1055_all_glibc-resolv-dynamic.patch
 Patch39:       %{name}-git.patch
 Patch40:       %{name}-bad-fix.patch
-Patch41:       %{name}-bug-12684.patch
-Patch42:       %{name}-revert-dso-breakout.patch
+Patch41:       %{name}-pr12892.patch
+Patch42:       %{name}-pr13013.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
 BuildRequires: autoconf
@@ -951,9 +951,7 @@ mv %{name}-ports-%{ports_version} ports
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
-# revert broken fix
-%patch41 -p1 -R
-# revert broken fix
+%patch41 -p1
 %patch42 -p1
 
 # cleanup backups after patching
@@ -1177,8 +1175,36 @@ done
 #   sr@ijelatin or sr@ijekavianlatin? (currently not supported)
 #   sr@ijekavian and sr@ijekavianlatin exist in: akonadi-googledata, amarok, k3b, konversation, ktorrent, wesnoth
 #
-# bn is used for bn_BD or bn_IN? Assume bn_IN as nothing for bn_BD appeared
-# till now.
+# Short forms (omitted country code, used instead of long form) for ambiguous or unclear cases:
+# aa=aa_ER
+# ar=common? (AE, BH, DZ, EG, IQ, JO, KW, LB, LY, MA, OM, QA, SA, SD, SY, TN, YE)
+# bn=bn_BD
+# ca=ca_ES
+# ckb=ckb_IQ
+# de=de_DE
+# en=common? (en_AU, en_CA, en_GB, en_NZ, en_US are used for particular variants)
+# eo=common
+# es=es_ES
+# eu=eu_ES
+# fr=fr_FR
+# fy=fy_NL
+# gez=gez_ET (?)
+# it=it_IT
+# li=li_NL
+# nds=nds_DE
+# nl=nl_NL
+# om=om_ET
+# pa=pa_IN
+# pt=pt_PT
+# ru=ru_RU
+# so=so_SO
+# sr=sr_RS [cyrillic]
+# sv=sv_SE
+# sw=sw_TZ (or common for KE, TZ, UG?)
+# ti=ti_ER (?)
+# tr=tr_TR
+# ur=ur_PK (?)
+# zh: no short code used (use zh_CN, zh_HK, zh_SG[not included yet], zh_TW)
 #
 # Omitted here - already existing (with libc.mo):
 #   be ca cs da de el en_GB es fi fr gl hr hu it ja ko nb nl pl pt_BR ru rw sk
@@ -1397,16 +1423,12 @@ fi
 %endif
 %attr(755,root,root) %{_bindir}/locale
 %attr(755,root,root) %{_bindir}/rpcgen
-%attr(755,root,root) %{_bindir}/sotruss
 %attr(755,root,root) %{_sbindir}/zdump
 %attr(755,root,root) %{_sbindir}/zic
 
 %dir %{_libexecdir}/getconf
 %attr(755,root,root) %{_libexecdir}/getconf/*
 
-%dir %{_libdir}/audit
-%attr(755,root,root) %{_libdir}/audit/sotruss-lib.so
-
 %dir %{_datadir}/locale
 %{_datadir}/locale/locale.alias
 
@@ -1514,6 +1536,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/catchsegv
 %attr(755,root,root) %{_bindir}/ldd
+%attr(755,root,root) %{_bindir}/sotruss
+%dir %{_libdir}/audit
+%attr(755,root,root) %{_libdir}/audit/sotruss-lib.so
+
 %{_mandir}/man1/catchsegv.1*
 %{_mandir}/man1/ldd.1*
 %lang(es) %{_mandir}/es/man1/ldd.1*