better way to manage the messed up cmake installer

2 files changed, 9 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4d1e4a464b6..7e651e2a4b4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,8 @@ pkgbase = arcus
 	license = GPLv3
 	makedepends = cmake
 	makedepends = python
-	depends = protobuf-ultimaker
+	depends = protobuf3
+	depends = python-protobuf3
 	source = https://github.com/Ultimaker/libArcus/archive/15.06.03.tar.gz
 	md5sums = c61fafaa82f71cef5e0f6780688f853e
 
diff --git a/PKGBUILD b/PKGBUILD
index 244de67e9f86..24014fcc91b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ url="https://github.com/Ultimaker/libArcus"
 arch=('i686' 'x86_64')
 license=('GPLv3')
 makedepends=('cmake' 'python')
-depends=('protobuf-ultimaker')
+depends=('protobuf3' 'python-protobuf3')
 source=(https://github.com/Ultimaker/libArcus/archive/${pkgver}.tar.gz)
 md5sums=('c61fafaa82f71cef5e0f6780688f853e')
 
@@ -16,7 +16,7 @@ build() {
   cd libArcus-${pkgver}
   mkdir build
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_PYTHON_PACKAGE=OFF
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
@@ -24,9 +24,11 @@ package() {
   cd libArcus-${pkgver}/build
   SITE_PACKAGES=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
   make DESTDIR="${pkgdir}" install
-  mv ${pkgdir}/usr/lib64  ${pkgdir}/usr/lib
-  mkdir -p ${pkgdir}${SITE_PACKAGES}
-  mv ../python/Arcus ${pkgdir}${SITE_PACKAGES}/Arcus
+  mv "${pkgdir}"/usr/lib64/* "${pkgdir}"/usr/lib/.
+  rm -rf "${pkgdir}/usr/lib64"
+  mkdir -p "${pkgdir}${SITE_PACKAGES}"
+  mv "${pkgdir}"/usr/lib/python3/dist-packages/* "${pkgdir}${SITE_PACKAGES}"/.
+  rm -rf "${pkgdir}"/usr/lib/python3
   #install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }