From 9635bd3a4a3a62e07ff0297090762acca6c21b11 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Wed, 8 Mar 2017 20:41:21 +0300 Subject: [PATCH] python-qt5:fixed file conflict with python3-qt5 --- programming/language/python/python-qt5/actions.py | 1 + programming/language/python/python-qt5/pspec.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py index b5a41bcc7f..39a4d57c27 100644 --- a/programming/language/python/python-qt5/actions.py +++ b/programming/language/python/python-qt5/actions.py @@ -32,6 +32,7 @@ def install(): pisitools.rename("/usr/bin/pylupdate5", "py2lupdate5") pisitools.rename("/usr/bin/pyrcc5", "py2rcc5") pisitools.rename("/usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so", "libpy2qt5qmlplugin.so") + pisitools.rename("/usr/lib/qt5/plugins/designer/libpyqt5.so", "libpy2qt5.so") pisitools.rename("/usr/share/qt5/qsci/api/python/PyQt5.api", "Py2Qt5.api") pisitools.rename("/usr/bin/pyuic5", "py2uic5") pisitools.domove("/usr/share/sip/PyQt5/*", "/usr/share/sip/Py2Qt5") diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index 4113862ef3..3f570809f3 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -69,7 +69,7 @@ /usr/bin/py2uic5 /usr/lib/python2.7/site-packages /usr/lib/qt5/plugins/PyQt5/libpy2qt5qmlplugin.so - /usr/lib/qt5/plugins/designer/libpyqt5.so + /usr/lib/qt5/plugins/designer/libpy2qt5.so /usr/share/qt5/qsci/api/python/Py2Qt5.api /usr/bin/py2rcc5 /usr/bin/py2lupdate5 @@ -91,7 +91,7 @@ - 2017-03-05 + 2017-03-08 5.7.1 Version Bump Kamil Atlı @@ -126,4 +126,4 @@ ayhanyalcinsoy@pisilinux.org - \ No newline at end of file +