Revert "Seafile client stack: switch to python3 (#138)"
This reverts commit b5559b7bf1
.
Broken.
This commit is contained in:
parent
ffa2d9e79c
commit
92043690b2
|
@ -1,22 +0,0 @@
|
||||||
--- python/ccnet/packet.py.ORIG
|
|
||||||
+++ python/ccnet/packet.py
|
|
||||||
@@ -72,7 +72,7 @@
|
|
||||||
def parse_header(buf):
|
|
||||||
try:
|
|
||||||
ver, ptype, length, id = struct.unpack(CCNET_HEADER_FORMAT, buf)
|
|
||||||
- except struct.error, e:
|
|
||||||
+ except struct.error as e:
|
|
||||||
raise NetworkError('error when unpack packet header: %s' % e)
|
|
||||||
|
|
||||||
return PacketHeader(ver, ptype, length, id)
|
|
||||||
--- python/ccnet/async/async_client.py.ORIG
|
|
||||||
+++ python/ccnet/async/async_client.py
|
|
||||||
@@ -26,7 +26,7 @@
|
|
||||||
]
|
|
||||||
|
|
||||||
def debug_print(msg):
|
|
||||||
- print msg
|
|
||||||
+ print(msg)
|
|
||||||
|
|
||||||
class AsyncClient(Client):
|
|
||||||
'''Async mode client'''
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'ccnet'
|
# Template file for 'ccnet'
|
||||||
pkgname=ccnet
|
pkgname=ccnet
|
||||||
version=6.1.8
|
version=6.1.8
|
||||||
revision=2
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static"
|
configure_args="--disable-static"
|
||||||
hostmakedepends="automake libsearpc-codegen libtool pkg-config vala"
|
hostmakedepends="automake libsearpc-codegen libtool pkg-config vala"
|
||||||
|
@ -37,8 +37,8 @@ ccnet-python_package() {
|
||||||
noarch=yes
|
noarch=yes
|
||||||
pycompile_module="ccnet"
|
pycompile_module="ccnet"
|
||||||
depends="ccnet"
|
depends="ccnet"
|
||||||
short_desc="Python3 bindings"
|
short_desc="Python2 bindings"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove ${py3_lib}
|
vmove usr/lib/python2.7
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
# Template file for 'libsearpc'
|
# Template file for 'libsearpc'
|
||||||
pkgname=libsearpc
|
pkgname=libsearpc
|
||||||
version=3.0.8
|
version=3.0.7
|
||||||
revision=1
|
revision=1
|
||||||
_tagversion=3.1-latest
|
|
||||||
wrksrc="${pkgname}-${_tagversion}"
|
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --disable-compile-demo"
|
configure_args="--disable-static --disable-compile-demo"
|
||||||
hostmakedepends="automake libtool pkg-config python3"
|
hostmakedepends="automake libtool pkg-config python"
|
||||||
makedepends="glib-devel jansson-devel"
|
makedepends="glib-devel jansson-devel"
|
||||||
python_version=3
|
|
||||||
pycompile_module="pysearpc"
|
|
||||||
short_desc="Seafile RPC library"
|
short_desc="Seafile RPC library"
|
||||||
maintainer="yopito <pierre.bourgin@free.fr>"
|
maintainer="yopito <pierre.bourgin@free.fr>"
|
||||||
license="GPL-3"
|
license="GPL-3"
|
||||||
|
@ -38,7 +35,7 @@ libsearpc-devel_package() {
|
||||||
|
|
||||||
libsearpc-codegen_package() {
|
libsearpc-codegen_package() {
|
||||||
short_desc+=" - code generator"
|
short_desc+=" - code generator"
|
||||||
depends="python3"
|
depends="python"
|
||||||
noarch=yes
|
noarch=yes
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vdoc "AUTHORS"
|
vdoc "AUTHORS"
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
# Template file for 'seafile-libclient'
|
# Template file for 'seafile-libclient'
|
||||||
pkgname=seafile-libclient
|
pkgname=seafile-libclient
|
||||||
version=6.1.8
|
version=6.1.8
|
||||||
revision=2
|
revision=1
|
||||||
_distname="${pkgname/-libclient/}"
|
_distname="${pkgname/-libclient/}"
|
||||||
wrksrc="${_distname}-${version}"
|
wrksrc="${_distname}-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static"
|
configure_args="--disable-static"
|
||||||
hostmakedepends="automake intltool libsearpc-codegen libtool pkg-config vala"
|
hostmakedepends="automake intltool libsearpc-codegen libtool pkg-config vala"
|
||||||
makedepends="ccnet-devel libcurl-devel"
|
makedepends="ccnet-devel libcurl-devel"
|
||||||
depends="python3"
|
depends="python"
|
||||||
pycompile_module="seafile"
|
|
||||||
short_desc="Cloud storage system - client command-line and libraries"
|
short_desc="Cloud storage system - client command-line and libraries"
|
||||||
maintainer="yopito <pierre.bourgin@free.fr>"
|
maintainer="yopito <pierre.bourgin@free.fr>"
|
||||||
license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX
|
license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX
|
||||||
|
@ -22,8 +21,8 @@ pre_configure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
# remove server stuff
|
# remove server files
|
||||||
rm -rf ${DESTDIR}${py3_sitelib}/searserv
|
rm -rf "${DESTDIR}/usr/lib/python2.7/site-packages/seaserv"
|
||||||
|
|
||||||
vdoc README.markdown
|
vdoc README.markdown
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue