[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - bin/pack-debug

[Andras Timar (via logerrit)]

 bin/pack-debug |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 633c9f83cbe1fa64dad1944c8ded7a3e2eb9a146
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Mar 2 16:04:14 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 2 16:06:09 2021 +0100

    [cp] fix packaging of pyuno-debuginfo
    
    Change-Id: I9c14835fdbfd660bd3a88f8a9bf96f3b85991d6a

diff --git a/bin/pack-debug b/bin/pack-debug
index 4f1f2a9e28a7..67c4cd50150d 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -133,7 +133,7 @@ do
 
 	# create stripped libraries and linked debug info files
 
-	for j in $(cat $i | awk '/^%attr.*[.](so|bin)([.].*)?"$/{print$2}')
+	for j in $(cat $i | awk '/^%attr.*libpython.*[.]so.*-gdb[.]py.*?"$/{next} /^%attr.*[.](so|bin)([.].*)?"$/{print$2}')
 	do
 		so=$(echo $j | tr -d '"')
 		cd ./$(dirname $so)
@@ -160,6 +160,7 @@ do
 	cat $i | awk '
 		/^Name:/ { print "Summary: Debug information for package "$2; print $0"-debuginfo";next }
 		/^Group:/ { print $1" Development/Debug";next }
+		/^%attr.*libpython.*[.]so.*-gdb[.]py.*?"$/ { next }
 		/^%attr.*[.](so|bin)([.].*)?"$/ { print substr($0, 1, length($0) - 1)".dbg\""; next }
 		/^%attr/ || /^Summary:/ { next }
 		{print}
@@ -267,7 +268,7 @@ do
 
 	# create stripped libraries and linked debug info files
 
-	for j in $(cat $i | awk '/^f .*[.](so|bin)([.].*)?$/{print$6}')
+	for j in $(cat $i | awk '/^f .*libpython.*[.]so.*-gdb[.]py.*$/{next} /^f .*[.](so|bin)([.].*)?$/{print$6}')
 	do
 		cd $(dirname $j)
 		so=$(basename $j)
@@ -290,6 +291,7 @@ do
 	cat $i | awk '
 		/^%product/ { print gensub("%product", "%product Debug info package of", "", $0);next }
 		/^%description/ { print gensub("%description", "%description Debug info package of", "", $0);next }
+		/^f .*libpython.*[.]so.*-gdb[.]py.*$/ { next }
 		/^f .*[.](so|bin)([.].*)?$/ { print $1,$2,$3,$4,$5".dbg",$6".dbg"; next }
 		/^[cf] / { next }
 		{print}
@@ -300,7 +302,7 @@ do
 
 	# restore original non stripped library files
 
-	for j in $(cat $i | awk '/^f .*[.](so|bin)([.].*)?$/{print$6}')
+	for j in $(cat $i | awk '/^f .*libpython.*[.]so.*-gdb[.]py.*$/{next} /^f .*[.](so|bin)([.].*)?$/{print$6}')
 	do
 		cd $(dirname $j)
 		so=$(basename $j)