update provides/replaces/conflits; mention arxlibertatis in pkgdesc+optdepends not .install

3 files changed, 19 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da5532d06445..c34f627b4fb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = arxfatalis-data-gog
-	pkgdesc = Arx Fatalis game data from GOG.com installer
+	pkgdesc = Arx Fatalis game data from GOG.com installer (for use with arxlibertatis)
 	pkgver = 1.21
 	pkgrel = 1
-	url = http://www.gog.com/en/gamecard/arx_fatalis
-	install = arx-fatalis-data.install
-	arch = i686
-	arch = x86_64
+	url = http://www.gog.com/game/arx_fatalis
+	arch = any
 	license = custom:commercial
 	makedepends = innoextract
-	provides = arx-fatalis-data
+	optdepends = arxlibertatis: native Linux game executable
+	provides = arxfatalis-data
+	conflicts = arxfatalis-data-copy
+	conflicts = arxfatalis-data-demo
 	conflicts = arx-fatalis-data-copy
 	conflicts = arx-fatalis-data-demo
+	replaces = arx-fatalis-data-gog
 	source = gog://setup_arx_fatalis_2.0.0.7.exe
 	source = arx-install-data
 	md5sums = 5be0898e71632e46ca430d7a32d0179a
diff --git a/PKGBUILD b/PKGBUILD
index 0fd552815192..4680588b4784 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,18 @@
 pkgname=arxfatalis-data-gog
 pkgver=1.21
 pkgrel=1
-pkgdesc='Arx Fatalis game data from GOG.com installer'
-url='http://www.gog.com/en/gamecard/arx_fatalis'
-arch=('i686' 'x86_64')
+pkgdesc='Arx Fatalis game data from GOG.com installer (for use with arxlibertatis)'
+url='http://www.gog.com/game/arx_fatalis'
+arch=('any')
 license=('custom:commercial')
+provides=('arxfatalis-data')
+replaces=('arx-fatalis-data-gog')
+conflicts=('arxfatalis-data-copy' 'arxfatalis-data-demo'
+           'arx-fatalis-data-copy' 'arx-fatalis-data-demo')
 makedepends=('innoextract')
-provides=('arx-fatalis-data')
-conflicts=('arx-fatalis-data-copy' 'arx-fatalis-data-demo')
-install='arx-fatalis-data.install'
+optdepends=('arxlibertatis:  native Linux game executable')
 PKGEXT='.pkg.tar'
-DLAGENTS+=('hib::/usr/bin/echo "Could not find %u. Manually download it to \"$(pwd)\", or set up a gog:// DLAGENT in /etc/makepkg.conf."; exit 1')
+DLAGENTS+=('gog::/usr/bin/echo "Could not find %u. Manually download it to \"$(pwd)\", or set up a gog:// DLAGENT in /etc/makepkg.conf."; exit 1')
 
 _gamepkg="setup_arx_fatalis_2.0.0.7.exe"
 
@@ -22,8 +24,6 @@ md5sums=('5be0898e71632e46ca430d7a32d0179a'
          'fc5456e4c213af243b65862db8d5db0a')
 
 package() {
-  cd $srcdir
-
-  chmod +x arx-install-data
-  ./arx-install-data --batch "$_gamepkg" "$pkgdir/usr/share/arx"
+    chmod +x arx-install-data
+    ./arx-install-data --batch "$_gamepkg" "$pkgdir/usr/share/arx"
 }
diff --git a/arx-fatalis-data.install b/arx-fatalis-data.install
deleted file mode 100644
index 3db61fb887ac..000000000000
--- a/arx-fatalis-data.install
+++ /dev/null
@@ -1,10 +0,0 @@
-
-post_install() {
-  echo "This package only installs the (proprietary) game data, no"
-  echo "game binaries."
-  echo "To actually play the game, compile and install Arx Libertatis,"
-  echo "the community-driven open-source port of Arx Fatalis for Linux"
-  echo "based on the publically released Arx Fatalis 1.21 source code."
-  echo " -> http://arx-libertatis.org"
-  echo " -> AUR package: arx-libertatis"
-}