[arch-commits] Commit in pyqt5/trunk (PKGBUILD)

Felix Yan felixonmars at archlinux.org
Sat Jul 30 18:23:42 UTC 2016


    Date: Saturday, July 30, 2016 @ 18:23:41
  Author: felixonmars
Revision: 272724

upgpkg: pyqt5 5.7-2

Modified:
  pyqt5/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-30 17:14:22 UTC (rev 272723)
+++ PKGBUILD	2016-07-30 18:23:41 UTC (rev 272724)
@@ -9,7 +9,7 @@
 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')
@@ -58,9 +58,6 @@
   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
@@ -85,7 +82,6 @@
   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
 }
 
@@ -108,8 +104,9 @@
 
   # 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



More information about the arch-commits mailing list