update pkgver

Signed-off-by: Jat <jat@sinosky.org>

1 files changed, 54 insertions, 51 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 281395e36959..199c7a7b8cb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname='xrdp'
 pkgname="$_pkgname-git"
-pkgver=0.9.18.r728.gcc7d5ef9
+pkgver=0.10.0_beta.3.r83.gcc7d5ef9
 pkgrel=1
 pkgdesc='An open source remote desktop protocol (RDP) server. Git version, devel branch.'
 url='https://github.com/neutrinolabs/xrdp'
@@ -15,81 +15,84 @@ depends=('libxrandr' 'fuse' 'libfdk-aac' 'ffmpeg' 'imlib2')
 checkdepends=('check')
 optdepends=('tigervnc' 'tightvnc' 'realvnc-vnc-server')
 backup=(
-    'etc/xrdp/sesman.ini'
-    'etc/xrdp/xrdp.ini'
-    'etc/xrdp/cert.pem'
-    'etc/xrdp/key.pem'
-    'etc/xrdp/startwm.sh'
-    'etc/xrdp/reconnectwm.sh'
-    'etc/default/xrdp'
+  'etc/xrdp/sesman.ini'
+  'etc/xrdp/xrdp.ini'
+  'etc/xrdp/cert.pem'
+  'etc/xrdp/key.pem'
+  'etc/xrdp/startwm.sh'
+  'etc/xrdp/reconnectwm.sh'
+  'etc/default/xrdp'
 )
 source=(
-    "git+$url#branch=devel"
-    'arch-config.diff'
+  "git+$url#branch=devel"
+  'arch-config.diff'
 )
 sha256sums=(
-    'SKIP'
-    'bbee3e132915dcc838983d8b9e6c4cecd97b2dcc920e38b3d0689227781ca956'
+  'SKIP'
+  'bbee3e132915dcc838983d8b9e6c4cecd97b2dcc920e38b3d0689227781ca956'
 )
 install="$pkgname.install"
 
 pkgver() {
-    cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname"
 
-    git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([0-9]*-g),r\1,;s,-,.,g'
+  _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1)
+  _rev=$(git rev-list --count "$_tag"..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//; s/-/_/'
 }
 
 prepare() {
-    cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname"
 
-    patch -p2 -i"$srcdir/arch-config.diff"
+  patch -p2 -i"$srcdir/arch-config.diff"
 }
 
 build() {
-    cd "$srcdir/$_pkgname"
-
-    ./bootstrap
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --sbindir=/usr/bin \
-        --with-systemdsystemunitdir=/usr/lib/systemd/system \
-        --enable-jpeg \
-        --enable-tjpeg \
-        --enable-fuse \
-        --enable-fdkaac \
-        --enable-opus \
-        --enable-rfxcodec \
-        --enable-mp3lame \
-        --enable-pixman \
-        --enable-painter \
-        --enable-vsock \
-        --enable-ipv6 \
-        --enable-pam-config=arch \
-        --enable-rdpsndaudin \
-        --with-imlib2
-
-    # Fight unused direct deps
-    sed -i -e "s| -shared | $LDFLAGS\0 |g" -e "s|    if test \"\$export_dynamic\" = yes && test -n \"\$export_dynamic_flag_spec\"; then|      func_append compile_command \" $LDFLAGS\"\n      func_append finalize_command \" $LDFLAGS\"\n\0|" libtool
-
-    make
+  cd "$srcdir/$_pkgname"
+
+  ./bootstrap
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --enable-jpeg \
+    --enable-tjpeg \
+    --enable-fuse \
+    --enable-fdkaac \
+    --enable-opus \
+    --enable-rfxcodec \
+    --enable-mp3lame \
+    --enable-pixman \
+    --enable-painter \
+    --enable-vsock \
+    --enable-ipv6 \
+    --enable-pam-config=arch \
+    --enable-rdpsndaudin \
+    --with-imlib2
+
+  # Fight unused direct deps
+  sed -i -e "s| -shared | $LDFLAGS\0 |g" -e "s|    if test \"\$export_dynamic\" = yes && test -n \"\$export_dynamic_flag_spec\"; then|      func_append compile_command \" $LDFLAGS\"\n      func_append finalize_command \" $LDFLAGS\"\n\0|" libtool
+
+  make
 }
 
 check() {
-    cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname"
 
-    make check
+  make check
 }
 
 package() {
-    cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname"
 
-    sed -i 's^param=Xorg^param=/usr/lib/Xorg^g' sesman/sesman.ini
+  sed -i 's^param=Xorg^param=/usr/lib/Xorg^g' sesman/sesman.ini
 
-    make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-    rm "$pkgdir/etc/xrdp/rsakeys.ini"
+  rm "$pkgdir/etc/xrdp/rsakeys.ini"
 
-    install -Dm644 'COPYING' -t "$pkgdir/usr/share/licenses/$_pkgname"
-    install -Dm644 instfiles/default/xrdp "$pkgdir/etc/default/$_pkgname"
+  install -Dm644 'COPYING' -t "$pkgdir/usr/share/licenses/$_pkgname"
+  install -Dm644 instfiles/default/xrdp "$pkgdir/etc/default/$_pkgname"
 }