Remove workaround for library installation path

This has been fixed upstream now, at least mostly
(see my last comment at GitHub).

See also: https://github.com/mumble-voip/mumble/issues/4477

2 files changed, 3 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72b338483214..53ff9fb2ab5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mumble-git
 	pkgdesc = Open source, low-latency, high quality voice chat (git version)
-	pkgver = 1.3.0.rc2.r867.g032135cb9
+	pkgver = 1.3.0.rc2.r886.g557bf8d3f
 	pkgrel = 1
 	epoch = 1
 	url = https://www.mumble.info
diff --git a/PKGBUILD b/PKGBUILD
index 6c498256911b..a0e588e90541 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 _pkgname=mumble
 pkgname="$_pkgname-git"
-pkgver=1.3.0.rc2.r867.g032135cb9
+pkgver=1.3.0.rc2.r886.g557bf8d3f
 pkgrel=1
 epoch=1
 pkgdesc='Open source, low-latency, high quality voice chat (git version)'
@@ -72,14 +72,5 @@ package() {
             'libpulse.so' 'libsndfile.so')
   cd "$_pkgname"
   make -C build DESTDIR="$pkgdir" install
-
-  # Fix location of libraries
-  # https://github.com/mumble-voip/mumble/issues/4477
-  install -d "$pkgdir/usr/lib/$_pkgname"
-  mv "$pkgdir/usr/lib/"libcelt* "$pkgdir/usr/lib/$_pkgname/"
-  mv "$pkgdir/usr/lib/plugins/"*.so "$pkgdir/usr/lib/$_pkgname/"
-  rmdir "$pkgdir/usr/lib/plugins"
-
-  # License
-  install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname"
+  install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname/"
 }