diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | fix-dbus.patch | 12 |
3 files changed, 20 insertions, 20 deletions
@@ -1,7 +1,7 @@ pkgbase = r-bspm pkgdesc = Bridge to System Package Manager - pkgver = 0.5.6 - pkgrel = 2 + pkgver = 0.5.7 + pkgrel = 1 url = https://cran.r-project.org/package=bspm arch = any license = MIT @@ -12,11 +12,11 @@ pkgbase = r-bspm depends = python-gobject depends = r optdepends = r-tinytest - source = https://cran.r-project.org/src/contrib/bspm_0.5.6.tar.gz + source = https://cran.r-project.org/src/contrib/bspm_0.5.7.tar.gz source = fix-dbus.patch - md5sums = 5c14be37758643b7f291ebabce670649 - md5sums = 36f5173c5c892c7c525ff320f99952ab - b2sums = 5ce4e6024c882a7a301d863edd7b6c5e7c6733c88894fecadc6f552f8bb48ee072bc85bc51d05e131bc2d5bb0fe30d24254faae905b6781a17a7981c5f649800 - b2sums = 82a8ebbdd7806619c4e03ec9c5f27515bc8589d75588a3e3fe45318bd6df4f549547b19ba5d69a6ebb0f8bcfe7cb9b2679738057dbbe7c4c2617271ef1548946 + md5sums = 9b13de322ef5bea57ec0a7f320ef7f7d + md5sums = b9264c2d1a89b4947b739ed62c7b2594 + b2sums = 8f4027862cea4b5a9324d8bbbaa1a1c985c2df9178895c66a7bd112e88a4c7a90c2676a37a696485078c1aff3896e6d5347406e0d4b92e65919a5ddc764412dc + b2sums = aa3a49c162c04e0600003dda3eb0b6920719df16b368b707a3e055aecfd9204d2e90f844965f685ff31c769f8066d2140e4d1b259d1765e30aeb4a0ab5ce54a6 pkgname = r-bspm @@ -2,10 +2,10 @@ # Contributor: sukanka <su975853527@gmail.com> _pkgname=bspm -_pkgver=0.5.6 +_pkgver=0.5.7 pkgname=r-${_pkgname,,} pkgver=${_pkgver//-/.} -pkgrel=2 +pkgrel=1 pkgdesc="Bridge to System Package Manager" arch=(any) url="https://cran.r-project.org/package=$_pkgname" @@ -25,10 +25,10 @@ optdepends=( ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz" "fix-dbus.patch") -md5sums=('5c14be37758643b7f291ebabce670649' - '36f5173c5c892c7c525ff320f99952ab') -b2sums=('5ce4e6024c882a7a301d863edd7b6c5e7c6733c88894fecadc6f552f8bb48ee072bc85bc51d05e131bc2d5bb0fe30d24254faae905b6781a17a7981c5f649800' - '82a8ebbdd7806619c4e03ec9c5f27515bc8589d75588a3e3fe45318bd6df4f549547b19ba5d69a6ebb0f8bcfe7cb9b2679738057dbbe7c4c2617271ef1548946') +md5sums=('9b13de322ef5bea57ec0a7f320ef7f7d' + 'b9264c2d1a89b4947b739ed62c7b2594') +b2sums=('8f4027862cea4b5a9324d8bbbaa1a1c985c2df9178895c66a7bd112e88a4c7a90c2676a37a696485078c1aff3896e6d5347406e0d4b92e65919a5ddc764412dc' + 'aa3a49c162c04e0600003dda3eb0b6920719df16b368b707a3e055aecfd9204d2e90f844965f685ff31c769f8066d2140e4d1b259d1765e30aeb4a0ab5ce54a6') prepare() { # fix dbus configuration @@ -38,7 +38,7 @@ prepare() { build() { mkdir build dbus R CMD INSTALL -l build "$_pkgname" \ - --configure-vars="BUILD_ROOT=$srcdir/dbus" + --configure-vars="BUILD_ROOT=${srcdir@Q}/dbus" # compile python bytecode python -m compileall -o 0 -o 1 -s build -p /usr/lib/R/library "build/$_pkgname/service" diff --git a/fix-dbus.patch b/fix-dbus.patch index e4f8fa9ba378..50cb7ba43433 100644 --- a/fix-dbus.patch +++ b/fix-dbus.patch @@ -1,8 +1,8 @@ diff --git a/bspm/configure b/bspm/configure -index 6077606..fa9f109 100755 +index 011a1e1..1bcfe10 100755 --- a/bspm/configure +++ b/bspm/configure -@@ -7,7 +7,7 @@ subst() { +@@ -11,7 +11,7 @@ subst() { DIR=`pwd` cd $1 && cat $2 | sed "s @BUS_NAME@ $BUS_NAME g" | @@ -11,12 +11,12 @@ index 6077606..fa9f109 100755 cd $DIR } -@@ -20,7 +20,7 @@ fi +@@ -24,7 +24,7 @@ fi if [ "$1" != "--without-dbus-service" ]; then SERVICE_DIR="$BUILD_ROOT/usr/share/dbus-1/system-services" - SYSCONF_DIR="$BUILD_ROOT/etc/dbus-1/system.d" + SYSCONF_DIR="$BUILD_ROOT/usr/share/dbus-1/system.d" - mkdir -p $SERVICE_DIR $SYSCONF_DIR - if [ ! -w "$SERVICE_DIR" ] || [ ! -w "$SYSCONF_DIR" ]; then - echo "* NOT installing D-Bus service" + mkdir -p $SERVICE_DIR $SYSCONF_DIR || exit 1 + subst inst/service dbus.service.in $SERVICE_DIR/$BUS_NAME.service + subst inst/service dbus.conf.in $SYSCONF_DIR/$BUS_NAME.conf |