Merge pull request #17321 from Rmys/master

docutils ver. bump

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():
+# def setup():
-    shelltools.cd("..")
+    # shelltools.cd("..")
-    shelltools.makedirs("build_python")
+    # shelltools.makedirs("build_python")
-    shelltools.copytree("./%s" % WorkDir,  "build_python")
+    # shelltools.copytree("./%s" % WorkDir,  "build_python")
-    shelltools.cd(WorkDir)
+    # shelltools.cd(WorkDir)
     
-    shelltools.cd("..")
+    # shelltools.cd("..")
-    shelltools.makedirs("build_python3")
+    # shelltools.makedirs("build_python3")
-    shelltools.copytree("./%s" % WorkDir,  "build_python3")
+    # shelltools.copytree("./%s" % WorkDir,  "build_python3")
-    shelltools.cd(WorkDir)
+    # shelltools.cd(WorkDir)
 
 def build():
-    pythonmodules.compile()
+    # pythonmodules.compile()
     
-    shelltools.cd("../build_python/%s" % WorkDir)
+    # shelltools.cd("../build_python/%s" % WorkDir)
-    pythonmodules.compile()
+    # pythonmodules.compile()
     
-    shelltools.system("pwd")
+    # shelltools.system("pwd")
-    shelltools.cd("../../build_python3/%s" % WorkDir)
+    # shelltools.cd("../../build_python3/%s" % WorkDir)
-    pythonmodules.compile(pyVer="3")
+    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()):
+    # for f in shelltools.ls("%s/usr/bin" % get.installDIR()):
-        pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", ""))
+        # pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", ""))
 
-    for bin in shelltools.ls("%s/usr/bin" % get.installDIR()):
+    # for bin in shelltools.ls("%s/usr/bin" % get.installDIR()):
-        pisitools.rename("/usr/bin/%s" % bin, "%s_2" % bin)
+        # pisitools.rename("/usr/bin/%s" % bin, "%s_2" % bin)
     
-    shelltools.cd("../build_python3/%s" % WorkDir)
+    # shelltools.cd("../build_python3/%s" % WorkDir)
-    pythonmodules.install(pyVer="3")
+    python3modules.install(pyVer="3")
     
     #Remove .py extensions from scripts in /usr/bin
-    for f in shelltools.ls("%s/usr/bin" % get.installDIR()):
+    # for f in shelltools.ls("%s/usr/bin" % get.installDIR()):
-        pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", ""))
+        # pisitools.domove("/usr/bin/%s" % f, "/usr/bin", f.replace(".py", ""))
-    else:
+    # else:
-        pisitools.dosym("/usr/bin/rst2man", "/usr/bin/rst2man.py")
+        # 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)

office/misc/docutils/pspec.xml

@@ -17,7 +17,7 @@
             <Dependency>python3-setuptools</Dependency>
             <Dependency>python-setuptools</Dependency>
             <Dependency>python3-devel</Dependency>
-            <Dependency>python-devel</Dependency>
+            <Dependency>python3-build</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -30,7 +30,7 @@
         </Files>
     </Package>
 
-    <Package>
+    <!--Package>
         <Name>python-docutils</Name>
         <Summary>Docutils module for python</Summary>
         <RuntimeDependencies>
@@ -39,7 +39,7 @@
         <Files>
             <Path fileType="library">/usr/lib/python2*</Path>
         </Files>
-    </Package>
+    </Package-->
 
     <Package>
         <Name>python3-docutils</Name>