From f95a17e4131ecf5ca4c38e58d93c1994367ab831 Mon Sep 17 00:00:00 2001
From: Rosa <rosa@rosa-build.rosalab.ru>
Date: Tue, 7 Aug 2012 13:28:10 +0000
Subject: [PATCH] Automatic import for version 2.15-3

---
 glibc.spec | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 4be6bf1..c6edef3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -74,7 +74,7 @@
 Summary:	The GNU libc libraries
 Name:		glibc
 Version:	2.15
-Release:	1
+Release:	3
 Epoch:		6
 License:	LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 Group:		System/Libraries
@@ -254,8 +254,7 @@ Patch58:	glibc-2.15-chromium-browser-crash.patch
 Conflicts:	kernel < %{enablekernel}
 
 # Don't try to explicitly provide GLIBC_PRIVATE versioned libraries
-%define _provides_exceptions GLIBC_PRIVATE
-%define _requires_exceptions GLIBC_PRIVATE
+%define _filter_GLIBC_PRIVATE 1
 
 Obsoletes:	ld.so
 Provides:	ld.so
@@ -275,7 +274,7 @@ Linux system will not function.
 
 %post -p %{_sbindir}/glibc_post_upgrade
 
-%files		-f libc.lang
+%files -f	libc.lang
 %if %{build_timezone}
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/localtime
 %endif
@@ -353,11 +352,15 @@ Linux system will not function.
 ########################################################################
 %if %{build_multiarch}
 #-----------------------------------------------------------------------
-%package	-n %{multilibc}
+%package -n	%{multilibc}
 Summary:	The GNU libc libraries
 Group:		System/Libraries
+Conflicts:	glibc < 6:2.14.90-13
 
-%description	-n %{multilibc}
+%post -n	%{multilibc}
+    %{_sbindir}/iconvconfig %{_libdir32}/gconv -o %{_libdir32}/gconv/gconv-modules.cache
+
+%description -n	%{multilibc}
 The glibc package contains standard libraries which are used by
 multiple programs on the system. In order to save disk space and
 memory, as well as to make upgrading easier, common system code is
@@ -366,7 +369,7 @@ contains the most important sets of shared libraries: the standard C
 library and the standard math library. Without these two libraries, a
 Linux system will not function.
 
-%files		-n %{multilibc}
+%files -n	%{multilibc}
 %{_slibdir32}/ld-%{version}.so
 %{_slibdir32}/ld-linux*.so.2
 %{_slibdir32}/lib*-[.0-9]*.so
@@ -493,7 +496,7 @@ library.
 ########################################################################
 %if %{build_nscd}
 #-----------------------------------------------------------------------
-%package	-n nscd
+%package -n	nscd
 Summary:	A Name Service Caching Daemon (nscd)
 Group:		System/Servers
 Conflicts:	kernel < 2.2.0
@@ -502,7 +505,7 @@ Requires(preun):rpm-helper
 Requires(post):	rpm-helper
 Requires(postun):rpm-helper
 
-%description	-n nscd
+%description -n	nscd
 Nscd caches name service lookups and can dramatically improve
 performance with NIS+, and may help with DNS as well.
 
@@ -521,7 +524,7 @@ performance with NIS+, and may help with DNS as well.
 	/sbin/service nscd condrestart > /dev/null 2>&1 || :
     fi
 
-%files		-n nscd
+%files -n 	nscd
 %config(noreplace) %{_sysconfdir}/nscd.conf
 %config(noreplace) %{_initrddir}/nscd
 %{_sbindir}/nscd
@@ -586,15 +589,15 @@ to use the internationalization features of the GNU libc.
 ########################################################################
 %if %{build_timezone}
 #-----------------------------------------------------------------------
-%package	-n timezone
+%package -n	timezone
 Summary:	Time zone descriptions
 Group:		System/Base
 Obsoletes:	zoneinfo
 
-%description	-n timezone
+%description -n	timezone
 These are configuration files that describe possible time zones.
 
-%files		-n timezone
+%files -n	timezone
 %{_sbindir}/zdump
 %{_sbindir}/zic
 %{_mandir}/man1/zdump.1*
@@ -1077,6 +1080,18 @@ export EXCLUDE_FROM_FULL_STRIP="ld-%{version}.so libpthread libc-%{version}.so l
 
 
 %changelog
+* Thu May 24 2012 Paulo Andrade <pcpa@mandriva.com.br> 6:2.15-3
++ Revision: 800481
+- Correct typo in libc6 post.
+
+* Wed May 23 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 6:2.15-2
++ Revision: 800239
+- add versioned conflict to deal with upgrades
+- use %%_filter_GLIBC_PRIVATE for new dependency generator
+
+  + Paulo Andrade <pcpa@mandriva.com.br>
+    - Generate 32 bit gconv-modules.cache in multilib libc6 package post.
+
 * Mon Feb 13 2012 Paulo Andrade <pcpa@mandriva.com.br> 6:2.15-1
 + Revision: 773711
 - Update to glibc-2.15.