Revert "efl: remove unnecessary packed files"

This reverts commit e0cdd9f65d99ce93c84395cb1be2a80b6efa1115.

Reason:

The rpm macro %{_libdir} is /usr/lib64 on the 64-bit build.
whereas %{_libdir} is /usr/lib on the 32-bit build.

But
the prefix of following files is /usr/lib on the 64-bit build.
No the prefix is not /usr/lib64 on the 64-bit build.

/usr/lib/debug/.build-id
/usr/lib/debug/.build-id/00
/usr/lib/debug/.build-id/00/6352bb9b60c759f3a3fbe71636aa1af486cbaf
/usr/lib/debug/.build-id/00/6352bb9b60c759f3a3fbe71636aa1af486cbaf.debug

For more details, I could get following information from 64-bit build.

rpmbuild/BUILDROOT$ ls -alt efl-1.25.1-0.aarch64/usr/lib/debug/.build-id/a1

df87ab6a793ab172fab8d72d500a1537f4170.debug -> ../../usr/lib64/libefl.so.1.25.1.debug
df87ab6a793ab172fab8d72d500a1537f4170 -> ../../../../lib64/libefl.so.1.25.1

I have no idea how the commit e0cdd9f removed the unexpected files above
We need to check if the same problem the commit e0cdd9f tried to solve happens again.

This patch is solving a rpm 64-bit build error on the TV product.
The build error is:

[  591s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/efl-1.25.1-0.aarch64
[  591s] error: Installed (but unpackaged) file(s) found:
[  591s]    /usr/lib/debug/.build-id/03/6e8ba7777cd243f78b8d0000b50f2479126c08
[  591s]    /usr/lib/debug/.build-id/03/6e8ba7777cd243f78b8d0000b50f2479126c08.debug
[  591s]    /usr/lib/debug/.build-id/1a/9a4c7f66ae4caea8a537f3af0ab7c77d65013b
[  591s]    /usr/lib/debug/.build-id/1a/9a4c7f66ae4caea8a537f3af0ab7c77d65013b.debug
[  591s]    /usr/lib/debug/.build-id/1e/a8bda77f406def3d779347c5e7c7ac619c75c2
[  591s]    /usr/lib/debug/.build-id/1e/a8bda77f406def3d779347c5e7c7ac619c75c2.debug

Yes, again, the prefix is /usr/lib, not /usr/lib64.

Change-Id: Ia8cd3f3b7543492bf579a4cfaf2c5543c08244ae

diff --git a/packaging/efl.spec b/packaging/efl.spec
index 7a57813..e703370 100644 (file)
--- a/packaging/efl.spec
+++ b/packaging/efl.spec
@@ -1329,8 +1329,8 @@ ldconfig -l %{_libdir}/libelementary.so.1.25.1
 %{_libdir}/libefl.so.*
 %{_bindir}/efl_debug
 %{_bindir}/efl_debugd
-%exclude %{_libdir}/debug/.build-id/*
-%exclude %{_libdir}/debug/*
+%exclude /usr/lib*/debug/.build-id/
+%exclude /usr/lib*/debug/*
 #avahi
 %if %{with x}
 %exclude %{_libdir}/libecore_avahi.so.*