git » pyqt5.git » commit ce64a0c

upgpkg: 5.7-2

author Felix Yan
2016-07-30 18:23:41 UTC
committer Felix Yan
2016-07-30 18:23:41 UTC
parent 00dd53ebaaa3c5e1ec4fdc38fe11326f04d9a695

upgpkg: 5.7-2

PKGBUILD +3 -6

diff --git a/PKGBUILD b/PKGBUILD
index a571dfe..c1e13fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
 pkgver=5.7
 _pkgver=$pkgver
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -57,9 +57,6 @@ package_pyqt5-common(){
   depends=('qt5-base')
 
   cd PyQt5_gpl-${_pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
   install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
 
   install -d "${pkgdir}"/usr/share/sip/PyQt5
@@ -84,7 +81,6 @@ package_python-pyqt5(){
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
   # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5}
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
 }
 
@@ -107,8 +103,9 @@ package_python2-pyqt5(){
 
   # Fix conflicts with python-pyqt5
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+  mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
 
-  rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5}
   rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
   rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api