From 7007495c882bf26e31c05a9bca167f687660bd03 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue, 23 Sep 2014 16:56:45 +0530
Subject: [PATCH] Don't own common debuginfo directories.

---
 glibc.spec | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/glibc.spec b/glibc.spec
index a0fec8e..75801b0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.20-35-gd330b98
 %define glibcversion 2.20.90
-%define glibcrelease 3%{?dist}
+%define glibcrelease 4%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1360,6 +1360,24 @@ mv debuginfocommon2.filelist debuginfocommon.filelist
 sort -u debuginfo.filelist > debuginfo2.filelist
 mv debuginfo2.filelist debuginfo.filelist
 
+# Remove some common directories from the common package debuginfo so that we
+# don't end up owning them.
+exclude_common_dirs()
+{
+	exclude_dirs="%{_prefix}/src/debug"
+	exclude_dirs="$exclude_dirs $(echo %{_prefix}/lib/debug{,/%{_lib},/bin,/sbin})"
+	exclude_dirs="$exclude_dirs $(echo %{_prefix}/lib/debug%{_prefix}{,/%{_lib},/libexec,/bin,/sbin})"
+
+	for d in $(echo $exclude_dirs | sed 's/ /\n/g'); do
+		sed -i "\|^%%dir $d/\?$|d" $1
+	done
+}
+
+%ifarch %{debuginfocommonarches}
+exclude_common_dirs debuginfocommon.filelist
+%endif
+exclude_common_dirs debuginfo.filelist
+
 %endif # 0%{?_enable_debug_packages}
 
 # Remove the `dir' info-heirarchy file which will be maintained
@@ -1662,6 +1680,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Sep 23 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-4
+- Don't own the common debuginfo directories (#1144853).
+
 * Tue Sep 16 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20.90-3
 - Sync with upstream master.
 - Revert patch for #737223.