Update to 9.0.2.r6228.96f2a38

2 files changed, 16 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b3bbf51110a..ec984f53c232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = teeworlds-ddnet-git
 	pkgdesc = A customized version by DDRaceNetwork of this 2D shooting game (Git)
-	pkgver = 8.1.1.r6113.79a523e
+	pkgver = 9.0.2.r6228.96f2a38
 	pkgrel = 1
 	url = http://ddnet.tw
 	arch = i686
@@ -18,7 +18,9 @@ pkgbase = teeworlds-ddnet-git
 	optdepends = teeworlds-ddnet-skins: extra skins
 	provides = teeworlds
 	provides = teeworlds-ddnet
+	provides = teeworlds-ddnet-skins
 	conflicts = teeworlds
+	conflicts = teeworlds-ddnet-skins
 	source = teeworlds-ddnet-git::git+https://github.com/ddnet/ddnet
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d0e9522700a..7420a3808225 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=teeworlds-ddnet-git
 _name=teeworlds-ddnet
-pkgver=8.1.1.r6113.79a523e
+pkgver=9.0.2.r6228.96f2a38
 pkgrel=1
 pkgdesc="A customized version by DDRaceNetwork of this 2D shooting game (Git)"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('custom')
 depends=('alsa-lib' 'glu' 'sdl' 'freetype2'  'openssl098')
 makedepends=('git' 'bam' 'gendesk' 'imagemagick')
 optdepends=('teeworlds-ddnet-skins: extra skins')
-provides=('teeworlds' 'teeworlds-ddnet')
-conflicts=('teeworlds')
+provides=('teeworlds' 'teeworlds-ddnet' 'teeworlds-ddnet-skins')
+conflicts=('teeworlds' 'teeworlds-ddnet-skins')
 source=($pkgname::git+https://github.com/ddnet/ddnet)
 sha256sums=('SKIP')
 
@@ -26,6 +26,12 @@ prepare() {
   convert "$pkgname/other/icons/DDNet.ico" "$srcdir/$pkgname.png"
   gendesk -f -n --pkgname "$_name" --pkgdesc "$pkgdesc" \
     --name 'Teeworlds' --categories 'Game;ArcadeGame'
+
+  # Download latest collection of the Skin Database from DDNet site
+  # See: http://ddnet.tw/skins/
+  rm -fR database.dir database.zip
+  curl -O http://ddnet.tw/skins/zip/database.zip
+  unzip -q database.zip
 }
 
 build() {
@@ -44,33 +50,10 @@ package() {
     # Install data files
   mkdir -p "$pkgdir"/usr/share/teeworlds/data
   cp -r data/* "$pkgdir"/usr/share/teeworlds/data
-
-    # Remove skins provided by teeworlds-ddnet-skins
-  for skin in \
-   "Ablush NeoN.png" "Apish Coke.png" "BadAnqelMonster.png" "Blind r0xr.png" \
-   "DuMoH.png" "Evil Puffi.png" "Flying Silex.png" "Hidden Assassin.png"     \
-   "Irradiated Sunny.png" "Mobys Skull.png" "PaladiN.png" "Red Coke.png"     \
-   "Shadow.png" "Sonic.png" "Straw Crytek.png" "Terrorist.png" "Volt.png"    \
-   "antiantey.png" "aqua.png" "bauer.png" "beast.png" "blacktee.png"         \
-   "bomb.png" "bunny.png" "caesar.png" "chera.png" "clefairy.png"            \
-   "demonlimekitty.png" "dino.png" "dragon.png" "draw.png" "emo.png"         \
-   "evil.png" "evilwolfe.png" "fuzzy_coala.png" "ghost.png" "ghostjtj.png"   \
-   "giraffe.png" "greensward.png" "greyfox.png" "greyfox_2.png"              \
-   "hammie-chew.png" "hedgehog.png" "jeet.png" "kintaro_2.png" "kirby.png"   \
-   "lightbulb.png" "m&mred.png" "m&myellow.png" "masterchief.png"            \
-   "mermydon-coala.png" "mermydon.png" "mike.png" "monstee.png" "mouse.png"  \
-   "musmann.png" "nanami.png" "nanas.png" "napoleon.png" "nersif.png"        \
-   "nosey.png" "oldman.png" "oldschool.png" "penguin.png" "pepsi.png"        \
-   "pikminpurple.png" "pikminwhite.png" "pikminyellow.png" "random.png"      \
-   "red_bird.png" "roman.png" "savage.png" "t2.png" "tails.png" "tank.png"   \
-   "tauren.png" "teerasta.png" "teledipsy.png" "telelaalaa.png" "telepo.png" \
-   "teletinkywinky.png" "troll.png" "ts2_contest_skin.png" "tweety.png"      \
-   "veteran.png" "voodoo_tee.png" "wartee.png" "whis.png"
-  do
-        rm "$pkgdir/usr/share/teeworlds/data/skins/$skin"
-  done  
-
-    # Install desktop and icon files
+  
+    # Install skins provided by Skins Database
+  cp "$srcdir"/database.dir/* "$pkgdir"/usr/share/teeworlds/data/skins/
+  
   install -Dm644 "$srcdir/$_name.desktop" "$pkgdir/usr/share/applications/$_name.desktop"
   install -Dm644 "$srcdir/$pkgname-0.png" "$pkgdir/usr/share/pixmaps/$_name.png"