Fix issues with nwnmovies beta by using the "latest" release instead

2 files changed, 12 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fc45a0b30d9..75103a627781 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nwn-diamond
 	pkgdesc = Neverwinter Nights is an RPG from Bioware. This requires the Diamond Collection DVD Release.
 	pkgver = 1.69
-	pkgrel = 6
+	pkgrel = 7
 	url = http://nwn.bioware.com/
 	install = nwn.install
 	arch = i686
@@ -23,11 +23,13 @@ pkgbase = nwn-diamond
 	noextract = nwclientgold.tar.gz
 	noextract = nwclienthotu.tar.gz
 	noextract = English_linuxclient169_xp2.tar.gz
+	noextract = nwmovies-latest.tar.gz
 	source = http://nwdownloads.bioware.com/neverwinternights/linux/gold/nwclientgold.tar.gz
 	source = http://nwdownloads.bioware.com/neverwinternights/linux/161/nwclienthotu.tar.gz
 	source = http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_xp2.tar.gz
 	source = http://home.roadrunner.com/~nwmovies/nwlinux-beta.tar.bz2
 	source = http://home.roadrunner.com/~nwmovies/cursors.tar.gz
+	source = http://home.roadrunner.com/~nwmovies/nwmovies/nwmovies-latest.tar.gz
 	source = nwn.launcher
 	source = nwn.desktop
 	md5sums = 0a059d55225fc32f905e86191d88a11f
@@ -35,6 +37,7 @@ pkgbase = nwn-diamond
 	md5sums = b021f0da3b3e00848521926716fdf487
 	md5sums = 3961f7464d3d5b7ac9f097aa9aa2f4d3
 	md5sums = 7be935418f0ececb5660f53b7a902b38
+	md5sums = 1698a83bce2050174670e30c42b9d673
 	md5sums = 7fd0497f55856edf50480b5acd3136d3
 	md5sums = bd7f80f5faa5ee1203371b4e8ec40638
 
diff --git a/PKGBUILD b/PKGBUILD
index f2589e18e30f..cba0c2939c77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=nwn-diamond
 pkgver=1.69
-pkgrel=6
+pkgrel=7
 pkgdesc="Neverwinter Nights is an RPG from Bioware. This requires the Diamond Collection DVD Release."
 url="http://nwn.bioware.com/"
 license=('custom')
@@ -22,13 +22,15 @@ source=("http://nwdownloads.bioware.com/neverwinternights/linux/gold/nwclientgol
 "http://files.bioware.com/neverwinternights/updates/linux/169/English_linuxclient169_xp2.tar.gz" \
 "http://home.roadrunner.com/~nwmovies/nwlinux-beta.tar.bz2" \
 "http://home.roadrunner.com/~nwmovies/cursors.tar.gz" \
+"http://home.roadrunner.com/~nwmovies/nwmovies/nwmovies-latest.tar.gz" \
 "nwn.launcher" "nwn.desktop")
-noextract=('nwclientgold.tar.gz' 'nwclienthotu.tar.gz' 'English_linuxclient169_xp2.tar.gz')
+noextract=('nwclientgold.tar.gz' 'nwclienthotu.tar.gz' 'English_linuxclient169_xp2.tar.gz' 'nwmovies-latest.tar.gz')
 md5sums=('0a059d55225fc32f905e86191d88a11f'
          '376cdece07106ea058d42b531f3146bb'
          'b021f0da3b3e00848521926716fdf487'
          '3961f7464d3d5b7ac9f097aa9aa2f4d3'
          '7be935418f0ececb5660f53b7a902b38'
+         '1698a83bce2050174670e30c42b9d673'
          '7fd0497f55856edf50480b5acd3136d3'
          'bd7f80f5faa5ee1203371b4e8ec40638')
 PKGEXT='.pkg.tar'
@@ -48,6 +50,10 @@ build()
     # Create Destination Directory
     install -d $pkgdir/opt/nwn
 
+    # Remove nwmovies which ships with the beta code; Replace with latest
+    rm -rf nwmovies
+    tar --overwrite -zxvf $srcdir/nwmovies-latest.tar.gz -C $srcdir/
+
     # Extract Data Files from DVD ROM
     unzip $_dvdpath/Data_Shared.zip -d $pkgdir/opt/nwn/ || return 1
     unzip $_dvdpath/Data_linux.zip  -d $pkgdir/opt/nwn/ || return 1