sip:fixed usr/bin/sip

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")
 

programming/language/python/sip/pspec.xml

@@ -22,6 +22,9 @@
     </Source>
     <Package>
         <Name>sip</Name>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+        </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/usr/local/bin</Path>
@@ -33,11 +36,8 @@
             <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
             <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/fix-linking.diff">fix-linking.diff</AdditionalFile>
         </AdditionalFiles>
-        <Summary>Development files for qscintilla2</Summary>
-        <RuntimeDependencies>
-            <Dependency>libgcc</Dependency>
-        </RuntimeDependencies>
     </Package>
+
     <Package>
         <Name>python3-sip</Name>
         <Files>
@@ -50,29 +50,33 @@
             <Dependency release="current">sip</Dependency>
         </RuntimeDependencies>
     </Package>
+
     <Package>
         <Name>python-sip</Name>
-        <Files>
-            <Path fileType="library">/usr/lib/python2.7/</Path>
-        </Files>
         <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
             <Dependency>python</Dependency>
             <Dependency release="current">sip</Dependency>
         </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/python2.7/</Path>
+        </Files>
+        <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
     </Package>
+
     <Package>
         <Name>sip-devel</Name>
-        <Files>
-            <Path fileType="header">/usr/include/python2.7</Path>
-            <Path fileType="header">/usr/include/python3.4m</Path>
-        </Files>
         <Summary>Development files for sip</Summary>
         <RuntimeDependencies>
             <Dependency release="current">sip</Dependency>
         </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include/python2.7</Path>
+            <Path fileType="header">/usr/include/python3.4m</Path>
+        </Files>
     </Package>
+
     <History>
         <Update release="2">
             <Date>2015-09-09</Date>
@@ -90,5 +94,3 @@
         </Update>
     </History>
 </PISI>
-
-<!-- By PiSiDo 2.3.1 -->