sip:fixed

This commit is contained in:
2015-10-10 08:14:05 +03:00
parent 4ee710a011
commit 10b45e06aa
2 changed files with 19 additions and 11 deletions
+6 -3
View File
@@ -16,7 +16,7 @@ py2dir = get.curPYTHON()
py3dir = "python3.4" py3dir = "python3.4"
def setup(): 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.cd("..")
shelltools.makedirs("build_python3") shelltools.makedirs("build_python3")
shelltools.copytree("./%s" % WorkDir, "build_python3") shelltools.copytree("./%s" % WorkDir, "build_python3")
@@ -42,8 +42,11 @@ def build():
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) 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) shelltools.cd("../build_python3/%s" % WorkDir)
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) 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")
+12 -7
View File
@@ -15,9 +15,14 @@
<Dependency>python-devel</Dependency> <Dependency>python-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Archive sha1sum="c0a09aa63523293c5ca39444746b1cef1253a0c5" type="targz">mirrors://sourceforge/pyqt/sip-4.16.9.tar.gz</Archive> <Archive sha1sum="c0a09aa63523293c5ca39444746b1cef1253a0c5" type="targz">mirrors://sourceforge/pyqt/sip-4.16.9.tar.gz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
</BuildDependencies>
<Patches> <Patches>
<Patch level="1">no-strip.patch</Patch> <Patch>no-strip.patch</Patch>
<Patch level="1">sip-outoftree.patch</Patch> <Patch>disable-rpaths.diff</Patch>
<Patch>fix-linking.diff</Patch>
<Patch>sip-outoftree.patch</Patch>
</Patches> </Patches>
</Source> </Source>
<Package> <Package>
@@ -27,13 +32,11 @@
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/sbin</Path> <Path fileType="data">/usr/share/licenses/sip/LICENSE</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/sip</Path>
</Files> </Files>
<AdditionalFiles> <AdditionalFiles>
<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/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> <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/fix-linking.diff">fix-linking.diff</AdditionalFile>-->
</AdditionalFiles> </AdditionalFiles>
</Package> </Package>
@@ -41,6 +44,7 @@
<Name>python3-sip</Name> <Name>python3-sip</Name>
<Files> <Files>
<Path fileType="library">/usr/lib/python3*</Path> <Path fileType="library">/usr/lib/python3*</Path>
<Path fileType="data">/usr/share/licenses/python3-sip/LICENSE</Path>
</Files> </Files>
<Summary>Python 3.x SIP bindings for C and C++ libraries</Summary> <Summary>Python 3.x SIP bindings for C and C++ libraries</Summary>
<RuntimeDependencies> <RuntimeDependencies>
@@ -60,6 +64,7 @@
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/python2.7/</Path> <Path fileType="library">/usr/lib/python2.7/</Path>
<Path fileType="data">/usr/share/licenses/python2-sip/LICENSE</Path>
</Files> </Files>
<Summary>Python 2.x SIP bindings for C and C++ libraries</Summary> <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
</Package> </Package>