- rel 2; avoid multi-arch file conflicts

diff --git a/glibc.spec b/glibc.spec
index 465a8f7ee9f1993d21f983952cdbef39fc1e7155..225d5428fd2fa95b5b72147d3ad5083d9b6b94cd 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}
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}

-Release:       1
+Release:       2

 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries


@@ -175,6 +175,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautoprov             .*\(GLIBC_PRIVATE\)
 %define                _noautoreq              .*\(GLIBC_PRIVATE\)
 
 %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
 %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