diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py index 3dd943701d..e1034e2829 100644 --- a/programming/language/python/sip/actions.py +++ b/programming/language/python/sip/actions.py @@ -22,14 +22,14 @@ def setup(): shelltools.copytree("./%s" % WorkDir, "build_python3") shelltools.cd(WorkDir) pythonmodules.run('configure.py \ - -b /usr/local/bin \ + -b /usr/bin \ -d /usr/lib/%s/site-packages \ -e /usr/include/%s/ \ CFLAGS+="%s" CXXFLAGS+="%s"' % (py2dir, py2dir, get.CFLAGS(), get.CXXFLAGS())) shelltools.cd("../build_python3/%s" % WorkDir) pythonmodules.run('configure.py \ - -b /usr/local/bin \ + -b /usr/bin \ -d /usr/lib/%s/site-packages/ \ -e /usr/include/%sm/ \ CFLAGS="%s" CXXFLAGS="%s"' % (py3dir, py3dir, get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") @@ -42,11 +42,8 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.rename("/usr/local/bin/sip", "sip2") - pisitools.dosym("/usr/local/bin/sip2", "/usr/bin/sip2") + pisitools.rename("/usr/bin/sip", "sip2") shelltools.cd("../build_python3/%s" % WorkDir) autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.rename("/usr/local/bin/sip", "sip") - pisitools.dosym("/usr/local/bin/sip", "/usr/bin/sip") diff --git a/programming/language/python/sip/pspec.xml b/programming/language/python/sip/pspec.xml index 2ebe0c6fd8..bba6519503 100644 --- a/programming/language/python/sip/pspec.xml +++ b/programming/language/python/sip/pspec.xml @@ -22,6 +22,9 @@ sip + + libgcc + /usr/bin /usr/local/bin @@ -33,11 +36,8 @@ disable-rpaths.diff fix-linking.diff - Development files for qscintilla2 - - libgcc - + python3-sip @@ -50,29 +50,33 @@ sip + python-sip - - /usr/lib/python2.7/ - Python 2.x SIP bindings for C and C++ libraries libgcc python sip + + /usr/lib/python2.7/ + + Python 2.x SIP bindings for C and C++ libraries + sip-devel - - /usr/include/python2.7 - /usr/include/python3.4m - Development files for sip sip + + /usr/include/python2.7 + /usr/include/python3.4m + + 2015-09-09 @@ -90,5 +94,3 @@ - -