Ensure libraries are not duplicated but symlinked

2 files changed, 10 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8cd302250273..becee88b283a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libdbuslog-git
 	pkgdesc = D-Bus based logging
 	pkgver = 1.0.15.r0.gd0dbccb
-	pkgrel = 1
+	pkgrel = 2
 	url = https://git.sailfishos.org/mer-core/libdbuslog
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 18afbdb357e6..ea2a51214561 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=(
   "${_pkgname}server-gio-git"
 )
 pkgver=1.0.15.r0.gd0dbccb
-pkgrel=1
+pkgrel=2
 pkgdesc="D-Bus based logging"
 arch=('i686' 'x86_64')
 depends=('glib2' 'dbus' 'libglibutil' 'libdbusaccess')
@@ -70,8 +70,14 @@ package_libdbuslogserver-common-git() {
 _package_server() {
   cd "$srcdir/package"
 
-  ls "usr/lib" | grep '^libdbuslogserver-'"$1"'\.so' | while read lib; do
-    install -Dm755 "usr/lib/$lib" "$pkgdir/usr/lib/$lib"
+  # Install libraries
+  find "usr/lib" -maxdepth 1 -type f | grep '/libdbuslogserver-'"$1"'\.so' | while read lib; do
+    install -Dm755 "$lib" "$pkgdir/$lib"
+  done
+  
+  # Copy links
+  find "usr/lib" -maxdepth 1 -type l | grep '/libdbuslogserver-'"$1"'\.so' | while read lib; do
+    cp -d "$lib" "$pkgdir/$lib"
   done
   
   ls "usr/include/dbuslogserver/$1" | grep '\.h$' | while read header; do