diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py index e1034e2829..e9ae2bd32d 100644 --- a/programming/language/python/sip/actions.py +++ b/programming/language/python/sip/actions.py @@ -16,7 +16,7 @@ py2dir = get.curPYTHON() py3dir = "python3.4" def setup(): - shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") + #shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;") shelltools.cd("..") shelltools.makedirs("build_python3") shelltools.copytree("./%s" % WorkDir, "build_python3") @@ -42,8 +42,11 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.rename("/usr/bin/sip", "sip2") - + pisitools.rename("/usr/bin/sip", "python2-sip") + pisitools.insinto("/usr/lib/python3.5/site-packages", "sipconfig.py") + pisitools.insinto("/usr/lib/python3.5/site-packages", "sipdistutils.py") + shelltools.cd("../build_python3/%s" % WorkDir) autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - + pisitools.insinto("/usr/lib/python3.5/site-packages", "sipconfig.py") + pisitools.insinto("/usr/lib/python3.5/site-packages", "sipdistutils.py") \ No newline at end of file diff --git a/programming/language/python/sip/pspec.xml b/programming/language/python/sip/pspec.xml index 30ded7bc95..e75afcba87 100644 --- a/programming/language/python/sip/pspec.xml +++ b/programming/language/python/sip/pspec.xml @@ -15,9 +15,14 @@ python-devel mirrors://sourceforge/pyqt/sip-4.16.9.tar.gz + + qt5-base-devel + - no-strip.patch - sip-outoftree.patch + no-strip.patch + disable-rpaths.diff + fix-linking.diff + sip-outoftree.patch @@ -27,13 +32,11 @@ /usr/bin - /usr/sbin - /usr/share/doc - /usr/share/sip + /usr/share/licenses/sip/LICENSE - disable-rpaths.diff - fix-linking.diff + @@ -41,6 +44,7 @@ python3-sip /usr/lib/python3* + /usr/share/licenses/python3-sip/LICENSE Python 3.x SIP bindings for C and C++ libraries @@ -60,6 +64,7 @@ /usr/lib/python2.7/ + /usr/share/licenses/python2-sip/LICENSE Python 2.x SIP bindings for C and C++ libraries