diff --git a/office/misc/docutils/actions.py b/office/misc/docutils/actions.py index 62687f5111..71169a5e78 100644 --- a/office/misc/docutils/actions.py +++ b/office/misc/docutils/actions.py @@ -4,52 +4,52 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -from pisi.actionsapi import pythonmodules +from pisi.actionsapi import python3modules from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import get WorkDir="docutils-%s" % get.srcVERSION() -def setup(): - shelltools.cd("..") - shelltools.makedirs("build_python") - shelltools.copytree("./%s" % WorkDir, "build_python") - shelltools.cd(WorkDir) +# def setup(): + # shelltools.cd("..") + # shelltools.makedirs("build_python") + # shelltools.copytree("./%s" % WorkDir, "build_python") + # shelltools.cd(WorkDir) - shelltools.cd("..") - shelltools.makedirs("build_python3") - shelltools.copytree("./%s" % WorkDir, "build_python3") - shelltools.cd(WorkDir) + # shelltools.cd("..") + # shelltools.makedirs("build_python3") + # shelltools.copytree("./%s" % WorkDir, "build_python3") + # shelltools.cd(WorkDir) def build(): - pythonmodules.compile() + # pythonmodules.compile() - shelltools.cd("../build_python/%s" % WorkDir) - pythonmodules.compile() + # shelltools.cd("../build_python/%s" % WorkDir) + # pythonmodules.compile() - shelltools.system("pwd") - shelltools.cd("../../build_python3/%s" % WorkDir) - pythonmodules.compile(pyVer="3") + # shelltools.system("pwd") + # shelltools.cd("../../build_python3/%s" % WorkDir) + python3modules.compile(pyVer="3") def install(): - pythonmodules.install() + # pythonmodules.install() #Remove .py extensions from scripts in /usr/bin - for f in shelltools.ls("%s/usr/bin" % get.installDIR()): - pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", "")) + # for f in shelltools.ls("%s/usr/bin" % get.installDIR()): + # pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", "")) - for bin in shelltools.ls("%s/usr/bin" % get.installDIR()): - pisitools.rename("/usr/bin/%s" % bin, "%s_2" % bin) + # for bin in shelltools.ls("%s/usr/bin" % get.installDIR()): + # pisitools.rename("/usr/bin/%s" % bin, "%s_2" % bin) - shelltools.cd("../build_python3/%s" % WorkDir) - pythonmodules.install(pyVer="3") + # shelltools.cd("../build_python3/%s" % WorkDir) + python3modules.install(pyVer="3") #Remove .py extensions from scripts in /usr/bin - for f in shelltools.ls("%s/usr/bin" % get.installDIR()): - pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", "")) - else: - pisitools.dosym("/usr/bin/rst2man", "/usr/bin/rst2man.py") + # for f in shelltools.ls("%s/usr/bin" % get.installDIR()): + # pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", "")) + # else: + # pisitools.dosym("/usr/bin/rst2man", "/usr/bin/rst2man.py") # for bin in shelltools.ls("%s/usr/bin" % get.installDIR()): # pisitools.rename("/usr/bin/%s" % bin, "%s_3" % bin) diff --git a/office/misc/docutils/pspec.xml b/office/misc/docutils/pspec.xml index 764cadf23a..bbc3f15345 100644 --- a/office/misc/docutils/pspec.xml +++ b/office/misc/docutils/pspec.xml @@ -17,7 +17,7 @@ python3-setuptools python-setuptools python3-devel - python-devel + python3-build @@ -30,7 +30,7 @@ - + python3-docutils