sip:fixed build

programming/language/python/sip/actions.py

@@ -16,23 +16,16 @@ 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")
     shelltools.cd(WorkDir)
-    pythonmodules.run('configure.py \
+    pythonmodules.run('configure.py CFLAGS+="%s" CXXFLAGS+="%s"' % (get.CFLAGS(), get.CXXFLAGS()))
-                    -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 \
+    pythonmodules.run('configure.py CFLAGS="%s" CXXFLAGS="%s"' % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3")
-                    -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")
 
 def build():
     autotools.make()
@@ -42,11 +35,11 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.rename("/usr/bin/sip", "python2-sip") 
+    pisitools.rename("/usr/bin/sip", "py2sip") 
-    pisitools.insinto("/usr/lib/python3.5/site-packages", "sipconfig.py")
+    #pisitools.insinto("/usr/lib/python2.7/site-packages", "siputils.py")
-    pisitools.insinto("/usr/lib/python3.5/site-packages", "sipdistutils.py")
+    #pisitools.insinto("/usr/lib/python2.7/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.4/site-packages", "siputils.py")
-    pisitools.insinto("/usr/lib/python3.5/site-packages", "sipdistutils.py")
+    #pisitools.insinto("/usr/lib/python3.4/site-packages", "sipdistutils.py")

programming/language/python/sip/pspec.xml

@@ -10,19 +10,15 @@
         <IsA>app:console</IsA>
         <Summary>SIP is a tool for generating bindings for C++ classes so that they can be used by Python</Summary>
         <Description>SIP is a tool for generating bindings for C and C++ libraries so that they can be used by Python. It takes any C or C++ libraries and converts them into Python extension modules.</Description>
-        <BuildDependencies>
-            <Dependency>python3-devel</Dependency>
-            <Dependency>python-devel</Dependency>
-        </BuildDependencies>
         <Archive sha1sum="c0a09aa63523293c5ca39444746b1cef1253a0c5" type="targz">mirrors://sourceforge/pyqt/sip-4.16.9.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency>qt5-base-devel</Dependency>
+            <Dependency versionFrom="5.5.1">qt5-base-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch>no-strip.patch</Patch>
+           <!-- <Patch>no-strip.patch</Patch>
             <Patch>disable-rpaths.diff</Patch>
             <Patch>fix-linking.diff</Patch>
-            <Patch>sip-outoftree.patch</Patch>
+            <Patch>sip-outoftree.patch</Patch>-->
         </Patches>
     </Source>
     <Package>
@@ -41,6 +37,9 @@
     </Package>
 
     <Package>
+        <BuildDependencies>
+            <Dependency>python3-devel</Dependency>
+        </BuildDependencies>
         <Name>python3-sip</Name>
         <Files>
             <Path fileType="library">/usr/lib/python3*</Path>
@@ -57,6 +56,9 @@
     <Package>
         <Name>python-sip</Name>
         <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
+        <BuildDependencies>
+            <Dependency>python-devel</Dependency>
+        </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
             <Dependency>python</Dependency>