- rel 2; fixes from upstream branch

diff --git a/glibc.spec b/glibc.spec
index b84c844c63911915ca6d46f17e55dc117cf4e085..faedf12cf522cab458bea183d984e73262a0c2b2 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -41,7 +41,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       1
+Release:       2
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -57,8 +57,8 @@ Source6:      %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
-# Patch0:              glibc-git.patch
-# Patch0-md5:  d41d8cd98f00b204e9800998ecf8427e
+Patch0:                glibc-git.patch
+# Patch0-md5:  2db6605e322eb1f615f3b66a1476d387
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -946,12 +946,12 @@ kodowania danych z poziomu dowolnego programu.
 %prep
 %setup -q
 
-%if "%{min_kernel}" < "2.6.32"
-echo "Minimal supported kernel is 2.6.32" >&2
+%if "%{min_kernel}" < "3.2.0"
+echo "Minimal supported kernel is 3.2.0" >&2
 exit 1
 %endif
 
-#%patch0 -p1
+%patch0 -p1
 
 %patch2 -p1
 %patch3 -p0