diff options
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r--[-rwxr-xr-x] | PKGBUILD | 36 | ||||
-rwxr-xr-x | clickable.install | 27 |
3 files changed, 23 insertions, 55 deletions
@@ -1,22 +1,19 @@ -pkgbase = clickable +pkgbase = clickable-git pkgdesc = Compile, build, and deploy Ubuntu Touch click packages all from the command line. - pkgver = 272.c18271a + pkgver = 5.0.0.r2.g6015551 pkgrel = 1 - url = https://github.com/bhdouglass/clickable - install = clickable.install + url = https://gitlab.com/clickable/clickable arch = i686 arch = x86_64 license = GPL3 makedepends = git - depends = python - depends = docker depends = python-cookiecutter + depends = docker depends = android-tools - optdepends = lxd provides = clickable conflicts = clickable - source = git+https://github.com/bhdouglass/clickable.git + source = git+https://gitlab.com/clickable/clickable.git sha256sums = SKIP -pkgname = clickable +pkgname = clickable-git diff --git a/PKGBUILD b/PKGBUILD index c3e2133a7bbf..fd3782b200de 100755..100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,34 +1,32 @@ # Maintainer: Marcin Tydelski <marcin.tydelski@gmail.com> # Contributor: Brian Douglass <https://github.com/bhdouglass/, http://bhdouglass.com/> -pkgname=clickable -pkgver=272.c18271a +_pkgname=clickable +pkgname=$_pkgname-git +pkgver=5.0.0.r2.g6015551 pkgrel=1 -_gitname=clickable pkgdesc='Compile, build, and deploy Ubuntu Touch click packages all from the command line.' arch=('i686' 'x86_64') -url='https://github.com/bhdouglass/clickable' +url='https://gitlab.com/clickable/clickable' license=('GPL3') -depends=('python' 'docker' 'python-cookiecutter' 'android-tools') -optdepends=('lxd') +depends=('python-cookiecutter' 'docker' 'android-tools') makedepends=('git') -provides=("${pkgname%}") -conflicts=("${pkgname%}") -install="${pkgname%-*}.install" -source=('git+https://github.com/bhdouglass/clickable.git') +provides=("$_pkgname") +conflicts=("$_pkgname") +source=('git+https://gitlab.com/clickable/clickable.git') sha256sums=('SKIP') pkgver() { - cd $_gitname - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) + cd $_pkgname + git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } -package() { - -mkdir -p $pkgdir/usr/bin $pkgdir/usr/lib/python3.7/site-packages/ -install -m755 -t $pkgdir/usr/bin/ $srcdir/$pkgname/clickable-dev -mv $pkgdir/usr/bin/clickable-dev $pkgdir/usr/bin/clickable -cp -R $srcdir/$pkgname/clickable $pkgdir/usr/lib/python3.7/site-packages/ +build() { + cd $_pkgname + python setup.py build } -# vim: ts=2 sw=2 et: +package() { + cd $_pkgname + python setup.py install --root="$pkgdir/" --optimize=1 --skip-build +} diff --git a/clickable.install b/clickable.install deleted file mode 100755 index aebe2a5521d1..000000000000 --- a/clickable.install +++ /dev/null @@ -1,27 +0,0 @@ -post_install() { - - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -ftq usr/share/icons/hicolor - - echo " " - echo "After installation you need to configure docker for clickable:" - echo " clickable setup-docker" - echo " " - -} - -post_upgrade() { - - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -ftq usr/share/icons/hicolor - -} - -post_remove() { - - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -ftq usr/share/icons/hicolor - -} - -# vim: ts=2 sw=2 et: |