- deUcoded ascii characters in morelocales patch (following glibc upstream) + few...

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index fb51887c295b4c2bf386468271e1421aa2cd29cc..7d17d232f1840d1b82df2229df5a81d52d3fbe01 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:       0.1
+Release:       3
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -57,7 +57,7 @@ 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:               glibc-git.patch
 # Patch0-md5:  d41d8cd98f00b204e9800998ecf8427e
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
@@ -175,6 +175,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautoprov             .*\(GLIBC_PRIVATE\)
 %define                _noautoreq              .*\(GLIBC_PRIVATE\)
 
+# to avoid multi-arch conflicts on getconf/* files
+%define                _libexecdir             %{_libdir}
+
 %description
 Contains the standard libraries that are used by multiple programs on
 the system. In order to save disk space and memory, as well as to ease
@@ -948,7 +951,7 @@ echo "Minimal supported kernel is 3.2.0" >&2
 exit 1
 %endif
 
-%patch0 -p1
+#%patch0 -p1
 
 %patch2 -p1
 %patch3 -p0
@@ -965,10 +968,8 @@ exit 1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
-# ENABLE WHEN "[error] circular dependencies between locale definitions" is fixed
-#%patch17 -p1
-# FIXME
-#%patch18 -p1
+%patch17 -p1
+%patch18 -p1
 %patch19 -p1
 
 %patch23 -p0