Resurrect Veles package, latest version

4 files changed, 29 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25ff15cc18b4..fbbe21f5d32a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,17 @@
 pkgbase = veles
-	pkgdesc = Binary data analysis and visualization tool
-	pkgver = 2017.2.0.YAGNI
+	pkgdesc = Visual reverse engineering tool.
+	pkgver = 2017.06.0.1
 	pkgrel = 1
-	url = https://codisec.com/veles
+	url = https://codisec.com/veles/
 	arch = x86_64
-	license = APLv2
-	source = git+https://github.com/codilime/veles.git#tag=2017.2.0.YAGNI
-	source = Veles.desktop
-	source = veles.png
-	sha256sums = SKIP
-	sha256sums = 7173aa5e8ef29125004b15051b8b978e181707294ea6b79784c2c586bc209260
-	sha256sums = ab162fdeb9b99a47a5283b4b8644a1c75e15b74f62f5a78bdcc59580df562489
-
-pkgname = veles
+	license = Apache
 	depends = qt5-base
-	depends = python
-	depends = python-veles
-	depends = protobuf
-	depends = zlib
-	conflicts = veles-bin
-	conflicts = veles-git
-
-pkgname = python-veles
-	depends = python
 	depends = python-pbr
 	depends = python-six
 	depends = python-msgpack
-	conflicts = python-veles-git
+	depends = python-pyopenssl
+	source = https://github.com/codilime/veles/releases/download/2017.06.0.1/Veles_2017.06.0.1_64bit_Ubuntu1604.deb
+	sha256sums = 9954a384e6ba733b50e07b9fd2a32f0dd181ef8aab11ebd5441744020949357e
+
+pkgname = veles
 
diff --git a/PKGBUILD b/PKGBUILD
index 54a3eefcbc43..d31dc76e2862 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,24 @@
-# Maintainer: Mateusz Paluszkiewicz <aifam96@gmail.com>
+# Maintainer: Tony Lambiris <tony@critialstack.com>
 
-pkgname=(veles python-veles)
-pkgver=2017.2.0.YAGNI
+pkgname=veles
+pkgver=2017.06.0.1
 pkgrel=1
-pkgdesc='Binary data analysis and visualization tool'
-url='https://codisec.com/veles'
-license=('APLv2')
-source=(
-  "git+https://github.com/codilime/veles.git#tag=${pkgver}"
-  'Veles.desktop'
-  'veles.png'
-)
-sha256sums=(
-  'SKIP'
-  '7173aa5e8ef29125004b15051b8b978e181707294ea6b79784c2c586bc209260'
-  'ab162fdeb9b99a47a5283b4b8644a1c75e15b74f62f5a78bdcc59580df562489'
-)
+pkgdesc="Visual reverse engineering tool."
 arch=('x86_64')
-
-build() {
-  makedepends=('git' 'cmake' 'qt5-base' 'python' 'python-pbr' 'python-six' 'python-msgpack' 'python-buildtools' 'python-virtualenv' 'protobuf' 'zlib')
-
-  mkdir -p "${srcdir}/veles/build"
-  cd "${srcdir}/veles/build"
-
-  cmake -D CMAKE_INSTALL_PREFIX:PATH="${pkgdir}/usr" -D CMAKE_BUILD_TYPE=MinSizeRel ..
-}
-
-package_veles() {
-  depends=('qt5-base' 'python' 'python-veles' 'protobuf' 'zlib')
-  conflicts=('veles-bin' 'veles-git')
-
-  # Install pixmap
-  install -Dm644 veles.png "${pkgdir}/usr/share/pixmaps/veles.png"
-
-  # Install launcher
-  desktop-file-install Veles.desktop --dir "${pkgdir}/usr/share/applications"
-
-  # Install license
-  install -Dm644 "${srcdir}/veles/LICENSE-2.0" "${pkgdir}/usr/share/licenses/veles/LICENSE"
-
-  cd "${srcdir}/veles/build"
-
-  # Install the program
-  make install
-}
-
-package_python-veles() {
-  depends=('python' 'python-pbr' 'python-six' 'python-msgpack')
-  conflicts=('python-veles-git')
-
-  cd "${srcdir}/veles/python"
-
-  python setup.py install --root="$pkgdir" --optimize=1
+url="https://codisec.com/veles/"
+license=('Apache')
+depends=('qt5-base' 'python-pbr' 'python-six' 'python-msgpack' 'python-pyopenssl')
+source=("https://github.com/codilime/veles/releases/download/2017.06.0.1/Veles_${pkgver}_64bit_Ubuntu1604.deb")
+sha256sums=('9954a384e6ba733b50e07b9fd2a32f0dd181ef8aab11ebd5441744020949357e')
+
+package() {
+	cd $srcdir
+	tar xvf data.tar.gz
+	cp -r usr $pkgdir
+	tar xfv $pkgdir/usr/share/veles-server/veles-*.tar.gz
+	_pypath="$(find . -type f -name setup.py -print -quit)"
+	pushd "$(dirname $_pypath)"
+	python setup.py build
+	python setup.py install --prefix=$pkgdir/usr
+	popd
 }
diff --git a/Veles.desktop b/Veles.desktop
deleted file mode 100644
index 671035f5b089..000000000000
--- a/Veles.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Veles
-Comment=Open source tool for binary data analysis
-Exec=/usr/bin/veles %U
-Icon=veles
-Type=Application
-StartupNotify=true
-Terminal=false
-Categories=Utility;
diff --git a/veles.png b/veles.png
deleted file mode 100644
index 11978601bd62..000000000000
--- a/veles.png
+++ /dev/null