From 2872a9480eb2f71864c3a7bac1d36469430540f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 7 Feb 2016 21:43:03 +0100 Subject: [PATCH] updated repoindex --- repoindex/default/PKGBUILD | 41 +++++++++++++++++++++++++++++++------- repoindex/git/PKGBUILD | 41 ++++++++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD index eb560c2f..2aca60ec 100644 --- a/repoindex/default/PKGBUILD +++ b/repoindex/default/PKGBUILD @@ -1,25 +1,52 @@ # Maintainer: Martchus _reponame=repoindex -pkgname=repoindex -pkgver=1.0.0 +pkgname=('repoindex' 'repoindex-web') +pkgver=0.0.2 pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Provides a web interface to browse Arch Linux package repositories." license=('GPL') -depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities') -makedepends= +depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities') +makedepends=('cmake') +backup=("etc/${_reponame}.conf") url="https://github.com/Martchus/${_reponame}" +options=(emptydirs) source=("repoindex-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('SKIP') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++ + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" make } -package() { +package_repoindex() { + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides server binary)." + optdepends=('repoindex-web: Web UI') + + # install files cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - make install + make install-binary install-service install-config + + # make directories for cache and data + mkdir -p "$pkgdir/var/cache/$_reponame" + chown http:http "$pkgdir/var/cache/$_reponame" + mkdir -p "$pkgdir/var/lib/$_reponame" + chown http:http "$pkgdir/var/lib/$_reponame" + mkdir -p "$pkgdir/etc" + cp "$pkgdir/usr/share/$_reponame/skel/repoindex.conf.js" "$pkgdir/etc/repoindex.conf" } +package_repoindex-web() { + arch=('any') + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides assets for web interface)." + depends=('repoindex') + backup=() + + # must call cmake again to adjust install prefix + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" + + # install files + make install-web +} diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD index ff7a4124..839f394b 100644 --- a/repoindex/git/PKGBUILD +++ b/repoindex/git/PKGBUILD @@ -1,14 +1,15 @@ # Maintainer: Martchus _reponame=repoindex -pkgname=repoindex -pkgver=1.0.0 -pkgrel=3 +pkgname=('repoindex-git' 'repoindex-web-git') +pkgver=0.0.1 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Provides a web interface to browse Arch Linux package repositories (git version)." license=('GPL') -depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities') -makedepends= +depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities') +makedepends=('cmake' 'git') url="https://github.com/Martchus/${_reponame}" +options=(emptydirs) source=("${pkgname}::git://github.com/Martchus/${_reponame}.git") sha256sums=('SKIP') @@ -18,13 +19,33 @@ pkgver() { } build() { - cd "${srcdir}/${pkgname}" - INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++ - make + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides server binary)." + optdepends=('repoindex-web: Web UI') + + # install files + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + make install-binary install-service install-config + + # make directories for cache and data + mkdir -p "$pkgdir/var/cache/$_reponame" + chown http:http "$pkgdir/var/cache/$_reponame" + mkdir -p "$pkgdir/var/lib/$_reponame" + chown http:http "$pkgdir/var/lib/$_reponame" + mkdir -p "$pkgdir/etc" + cp "$pkgdir/usr/share/$_reponame/skel/repoindex.conf.js" "$pkgdir/etc/repoindex.conf" } package() { - cd "${srcdir}/${pkgname}" - make install + arch=('any') + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides assets for web interface)." + depends=('repoindex') + backup=() + + # must call cmake again to adjust install prefix + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" + + # install files + make install-web }