refactor $$ package to $$-git

2 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac61c91c824a..222e119fcf31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
-pkgbase = openboard
+pkgbase = openboard-git
 	pkgdesc = Interactive whiteboard software for schools and universities
-	pkgver = 1.5.3
-	pkgrel = 2
+	pkgver = v1.5.3.r0.g426b1f7a
+	pkgrel = 1
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
-	arch = i686
 	license = GPL3
 	depends = qt5-base
 	depends = qt5-multimedia
@@ -19,20 +18,20 @@ pkgbase = openboard
 	depends = libfdk-aac
 	depends = sdl
 	depends = ffmpeg
-	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.5.3.tar.gz
-	source = https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip
+	source = git://github.com/OpenBoard-org/OpenBoard.git#branch=master
+	source = git://github.com/OpenBoard-org/OpenBoard-ThirdParty.git
 	source = qchar.patch
 	source = qwebkit.patch
 	source = https://github.com/OpenBoard-org/OpenBoard/pull/218.diff
 	source = https://github.com/OpenBoard-org/OpenBoard/pull/223.diff
 	source = openboard.desktop
-	md5sums = fe3644033dccfd16c80b683210e4ac57
-	md5sums = fa1ff089f0bcc15d2a510bb90cdd3002
+	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = bf2c524f3897cfcfb4315bcd92d4206e
 	md5sums = 60f64db6bf627015f4747879c4b30fd3
 	md5sums = f484614cc48181287607afb5a45ef644
 	md5sums = 04c421c140e983d41975943ede5fe61a
 	md5sums = 21d1749400802f8fc0669feaf77de683
 
-pkgname = openboard
+pkgname = openboard-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c71ee08d794..a1d1db8163c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,36 @@
-# Maintainer: Frank Siegert <frank.siegert@googlemail.com>
-pkgname=openboard
-pkgver=1.5.3
-pkgrel=2
+# Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
+
+pkgname=openboard-git
+_fragment="#branch=master"
+pkgver=v1.5.3.r0.g426b1f7a
+pkgrel=1
 pkgdesc="Interactive whiteboard software for schools and universities"
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url="http://openboard.ch/index.en.html"
 license=('GPL3')
 depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg')
-source=("https://github.com/OpenBoard-org/OpenBoard/archive/v$pkgver.tar.gz"
-        "https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip"
+source=("git://github.com/OpenBoard-org/OpenBoard.git${_fragment}"
+        "git://github.com/OpenBoard-org/OpenBoard-ThirdParty.git"
         qchar.patch
         qwebkit.patch
         https://github.com/OpenBoard-org/OpenBoard/pull/218.diff
         https://github.com/OpenBoard-org/OpenBoard/pull/223.diff
         openboard.desktop)
-md5sums=('fe3644033dccfd16c80b683210e4ac57'
-         'fa1ff089f0bcc15d2a510bb90cdd3002'
+md5sums=('SKIP'
+         'SKIP'
          'bf2c524f3897cfcfb4315bcd92d4206e'
          '60f64db6bf627015f4747879c4b30fd3'
          'f484614cc48181287607afb5a45ef644'
          '04c421c140e983d41975943ede5fe61a'
          '21d1749400802f8fc0669feaf77de683')
 
-prepare() {
-  rm -rf $srcdir/OpenBoard-ThirdParty
-  mv "$srcdir/OpenBoard-ThirdParty-master" "$srcdir/OpenBoard-ThirdParty"
+pkgver() {
+  cd $srcdir/OpenBoard
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
-  cd $srcdir/OpenBoard-$pkgver
+prepare() {
+  cd $srcdir/OpenBoard
   patch -p1 < $srcdir/qchar.patch
   patch -p1 < $srcdir/qwebkit.patch
   patch -p1 < $srcdir/218.diff
@@ -53,21 +57,21 @@ build() {
   make
   cd ..
 
-  cd "$srcdir/OpenBoard-$pkgver"
+  cd "$srcdir/OpenBoard"
   qmake OpenBoard.pro -spec linux-g++
   make
 }
 
 package() {
-  cd "$srcdir/OpenBoard-$pkgver"
+  cd "$srcdir/OpenBoard"
 
   mkdir -p $pkgdir/opt/openboard
 
   for i in customizations etc i18n library; do
-    cp -rp $srcdir/OpenBoard-$pkgver/resources/$i $pkgdir/opt/openboard;
+    cp -rp $srcdir/OpenBoard/resources/$i $pkgdir/opt/openboard;
   done
 
-  cp -rp $srcdir/OpenBoard-$pkgver/resources/images/OpenBoard.png $pkgdir/opt/openboard/
+  cp -rp $srcdir/OpenBoard/resources/images/OpenBoard.png $pkgdir/opt/openboard/
   cp -rp build/linux/release/product/OpenBoard $pkgdir/opt/openboard/
 
   mkdir -p $pkgdir/usr/share/applications