Merge pull request #7291 from blue-devil/master
docutils rebuilt with python3 bindings, libnl:version bump
This commit is contained in:
GitHub
@@ -7,16 +7,21 @@
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
shelltools.system("./autogen.sh")
|
||||
autotools.configure("--disable-static")
|
||||
|
||||
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def check():
|
||||
autotools.make("check")
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("COPYING", "ChangeLog")
|
||||
pisitools.dodoc("COPYING", "ChangeLog")
|
||||
@@ -3,7 +3,7 @@
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>libnl</Name>
|
||||
<Homepage>http://people.suug.ch/~tgr/libnl</Homepage>
|
||||
<Homepage>https://github.com/thom311/libnl</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A library for applications dealing with netlink sockets</Summary>
|
||||
<Description>libnl is a convenience library to simplify the usage of the Linux kernel's netlink sockets interface for network manipulation.</Description>
|
||||
<Archive sha1sum="4fc4c3b6812dc7e68ef8acb69287583685266a0b" type="targz">https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz</Archive>
|
||||
<Archive sha1sum="153fa111f70b73199d014b03c9a5c71a4211a970" type="targz">https://github.com/thom311/libnl/archive/libnl3_5_0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>glibc</Dependency>
|
||||
<Dependency>flex</Dependency>
|
||||
@@ -48,6 +48,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2019-12-05</Date>
|
||||
<Version>3.5.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Blue DeviL</Name>
|
||||
<Email>bluedevil@sctzine.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-07-29</Date>
|
||||
<Version>3.4.0</Version>
|
||||
@@ -77,4 +84,4 @@
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
@@ -9,10 +9,37 @@ 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)
|
||||
|
||||
shelltools.cd("..")
|
||||
shelltools.makedirs("build_python3")
|
||||
shelltools.copytree("./%s" % WorkDir, "build_python3")
|
||||
shelltools.cd(WorkDir)
|
||||
|
||||
def build():
|
||||
pythonmodules.compile()
|
||||
|
||||
shelltools.cd("../build_python/%s" % WorkDir)
|
||||
pythonmodules.compile()
|
||||
|
||||
shelltools.system("pwd")
|
||||
shelltools.cd("../../build_python3/%s" % WorkDir)
|
||||
pythonmodules.compile(pyVer="3")
|
||||
|
||||
def install():
|
||||
pythonmodules.install()
|
||||
|
||||
pisitools.dodoc("COPYING.txt", "PKG-INFO", "README.txt")
|
||||
|
||||
shelltools.cd("../build_python/%s" % WorkDir)
|
||||
pythonmodules.install()
|
||||
|
||||
shelltools.cd("../../build_python3/%s" % WorkDir)
|
||||
pythonmodules.install(pyVer="3")
|
||||
|
||||
#Remove .py extensions from scripts in /usr/bin
|
||||
for f in shelltools.ls("%s/usr/bin" % get.installDIR()):
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
Index: docutils-0.6/docutils/writers/latex2e/__init__.py
|
||||
===================================================================
|
||||
--- docutils-0.6.orig/docutils/writers/latex2e/__init__.py
|
||||
+++ docutils-0.6/docutils/writers/latex2e/__init__.py
|
||||
@@ -35,7 +35,7 @@ class Writer(writers.Writer):
|
||||
|
||||
settings_spec = (
|
||||
'LaTeX-Specific Options',
|
||||
- 'The LaTeX "--output-encoding" default is "latin-1:strict".',
|
||||
+ 'The LaTeX "--input-encoding" default is "UTF-8:strict".',
|
||||
(('Specify documentclass. Default is "article".',
|
||||
['--documentclass'],
|
||||
{'default': 'article', }),
|
||||
@@ -186,7 +186,8 @@ class Writer(writers.Writer):
|
||||
{'default': None, }),
|
||||
),)
|
||||
|
||||
- settings_defaults = {'output_encoding': 'latin-1',
|
||||
+ settings_defaults = {'output_encoding': 'utf8',
|
||||
+ 'input_encoding': 'utf8',
|
||||
'sectnum_depth': 0 # updated by SectNum transform
|
||||
}
|
||||
|
||||
@@ -12,19 +12,58 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A library for processing plaintext documentation</Summary>
|
||||
<Description>A library for processing plaintext documentation into useful formats, such as HTML, XML, and LaTeX.</Description>
|
||||
<Archive sha1sum="32cefb69ac3dab5b04c4d150776f35419cc4c863" type="targz">mirrors://sourceforge/docutils/docutils-0.14.tar.gz</Archive>
|
||||
<Archive sha1sum="4cfc536e047cb9b1e06f5bd230f391276e1161bb" type="targz">https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61/docutils-0.15.2.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>python3-setuptools</Dependency>
|
||||
<Dependency>python-setuptools</Dependency>
|
||||
<Dependency>python3-devel</Dependency>
|
||||
<Dependency>python-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>docutils</Name>
|
||||
<Summary>A library and applications for processing plaintext documentation</Summary>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>python-docutils</Name>
|
||||
<Summary>Docutils module for python</Summary>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/python2*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>python3-docutils</Name>
|
||||
<Summary>Docutils module for python3</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>python3</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/python3*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2019-12-07</Date>
|
||||
<Version>0.15.2</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Blue Devil</Name>
|
||||
<Email>bluedevil@sctzine.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2019-12-06</Date>
|
||||
<Version>0.14</Version>
|
||||
<Comment>Rebuilt with python3 bindings.</Comment>
|
||||
<Name>Blue Devil</Name>
|
||||
<Email>bluedevil@sctzine.com</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2018-08-05</Date>
|
||||
<Version>0.14</Version>
|
||||
|
||||
@@ -2,7 +2,20 @@
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>docutils</Name>
|
||||
<Summary xml:lang="tr">Düz yazı belgelendirme işleme için kütüphane</Summary>
|
||||
<Summary xml:lang="tr">Düz yazı belgelendirme işleme için gerekli uygulamalar ve kitaplığı</Summary>
|
||||
<Description xml:lang="tr">Docutils, düzyazı belgelendirmelerini HTML, LaTeX, man-betleri, açık belge veya XML biçimlerine dönüştürebilen açık kaynak kodlu uygulamalar ve kitaplığıdır.</Description>
|
||||
<Description xml:lang="es">Librería para procesamiento de texto plano para conversión a formatos útiles como HTML, XML, y LaTeX.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>python-docutils</Name>
|
||||
<Summary xml:lang="tr">Python için docutils modülü</Summary>
|
||||
<Description xml:lang="tr">Python için docutils modülü</Description>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>python3-docutils</Name>
|
||||
<Summary xml:lang="tr">Python3 için docutils modülü</Summary>
|
||||
<Description xml:lang="tr">Python3 için docutils modülü</Description>
|
||||
</Package>
|
||||
</PISI>
|
||||
|
||||
Reference in New Issue
Block a user