Rebuild for adding faction camp recipe mod

1 files changed, 23 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9feaf7b..89a7d10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.2
 _pkgver=0.E-2
-pkgrel=1.8
+pkgrel=1.10
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -32,6 +32,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "cataclysm-dda-soundpack_damalsksoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_damalsksoundpack.git/snapshot/cataclysm-dda-soundpack_damalsksoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         "cataclysm-dda-mod_hack-fix.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hack-fix.git/snapshot/cataclysm-dda-mod_hack-fix-master.tar.xz"
+        "cataclysm-dda-mod_faction-camp-recipe-expansion.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_faction-camp-recipe-expansion.git/snapshot/cataclysm-dda-mod_faction-camp-recipe-expansion-master.tar.xz"
         "cataclysm-dda-mod_hk-loadout.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hk-loadout.git/snapshot/cataclysm-dda-mod_hk-loadout-master.tar.xz"
         "cataclysm-dda-mod_recipe-fixes.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_recipe-fixes.git/snapshot/cataclysm-dda-mod_recipe-fixes-master.tar.xz"
         "cataclysm-dda-mod_battle-maid-redone.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone.git/snapshot/cataclysm-dda-mod_battle-maid-redone-master.tar.xz"
@@ -41,9 +42,10 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
         '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8'
         '33b00c4c6447208339b4d1db6d498f1df5311061140371ee213f3885e152285f260f4a7a6027dd96110744f67cc2056757638cf437e031f85d0308ca6a329636'
         'e6c6b3a4cd40e57819d148fdc1f0462332d0cfab37d2021161988cbd4142acf9b5029b70df40fe5b8e286a43398488b248a702e48846da22c8490b7cd5ac182f'
-        '34d697edc4bbbace5ecf147ec8ecbccf82e30f44191536eb12277350364b89b9efc675134ff458e3c583704ac77a7aa0f4330fa395816c22a0e2784881e0426a'
+        '1884b9c6f8775f803f20b3a34c23fa6d5d9add03e2bfcaaa0abc60f928d55c8208b9ea03f8c25e34670ab4edb17fd1d72b1e0cd9ba258f5dd1e67cba422ae283'
         '353fed5883383063b2b2d3a81f3a5d5364a0351d037f5456e9d89d4eeee3b20b3e1f9c74c3d458193deb8ac1fa41d73d86e8364a623a6344c32c55437f362d4b'
         'eb4f2c80f9452215eaf89b074fe556afef043d7fcd49768242d09e1a0e707da9f7912e598a81b2cbf60cda8715ab5e452ceaaa0f2377c90f50a3816b11ffddf0'
+        'babe21ed4976954c83fcf017232ff8f05203cbcb7b3ef6f37d37762687426227e24c618735aaa4ea6dfcadac1c8941ea15abf5a9becf64b461760731adf8b55c'
         'd30f9d3e1c6745f733f714afd085125fd9b3004f0d708cbedba779b1309d58b98bcea19bc0da3cdd315df402f9a74e847a02b8cc0ef47a96b4621db0b0bd363f'
         'a1370b0c8041a2ef59a683d3a07e037d73f2909776457c19d96ad3aed7f74f06afe7db1ff80e22343d6594cb51613e27aaaed2033233ebad17d42af7ecac7ae3'
         '5909c599a7b87118c3e998827b9dba0068f9c574011ab6ff15ffb6a7a82223b573da7c7f35c2e11fb535cff20311ee47f6493dd94f8c4a166e7147ca7c3bc189')
@@ -88,14 +90,16 @@ package_cataclysm-dda() {
   cp 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
 
   # Mods
-  mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-master" "$srcdir/cataclysm-dda-mod_battle-maid-redone"
-  cp -r "$srcdir/cataclysm-dda-mod_battle-maid-redone" "$pkgdir/usr/share/cataclysm-dda/mods"
-  mv "$srcdir/cataclysm-dda-mod_hack-fix-master" "$srcdir/cataclysm-dda-mod_hack-fix"
-  cp -r "$srcdir/cataclysm-dda-mod_hack-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
-  mv "$srcdir/cataclysm-dda-mod_hk-loadout-master" "$srcdir/cataclysm-dda-mod_hk-loadout"
-  cp -r "$srcdir/cataclysm-dda-mod_hk-loadout" "$pkgdir/usr/share/cataclysm-dda/mods"
-  mv "$srcdir/cataclysm-dda-mod_recipe-fixes-master" "$srcdir/cataclysm-dda-mod_recipe-fixes"
-  cp -r "$srcdir/cataclysm-dda-mod_recipe-fixes" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-master" "$srcdir/battle-maid-redone"
+  cp -r "$srcdir/battle-maid-redone" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_hack-fix-master" "$srcdir/hack-fix"
+  cp -r "$srcdir/hack-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_hk-loadout-master" "$srcdir/hk-loadout"
+  cp -r "$srcdir/hk-loadout" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_recipe-fixes-master" "$srcdir/recipe-fixes"
+  cp -r "$srcdir/recipe-fixes" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-mod_faction-camp-recipe-expansion-master" "$srcdir/faction-camp-recipe-expansion"
+  cp -r "$srcdir/faction-camp-recipe-expansion" "$pkgdir/usr/share/cataclysm-dda/mods"
 
   # License
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -118,15 +122,15 @@ package_cataclysm-dda-tiles() {
   install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Mods
-  mv "$srcdir/cataclysm-dda-tileset_msx-tileset-master" "$srcdir/cataclysm-dda-tileset_msx-tileset"
-  cp -r "$srcdir/cataclysm-dda-tileset_msx-tileset" "$pkgdir/usr/share/cataclysm-dda/gfx"
-  mv "$srcdir/cataclysm-dda-mod_msx-tileset-fix-master" "$srcdir/cataclysm-dda-mod_msx-tileset-fix"
-  cp -r "$srcdir/cataclysm-dda-mod_msx-tileset-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
-  mv "$srcdir/cataclysm-dda-soundpack_damalsksoundpack-master" "$srcdir/cataclysm-dda-soundpack_damalsksoundpack"
-  cp -r "$srcdir/cataclysm-dda-soundpack_damalsksoundpack" "$pkgdir/usr/share/cataclysm-dda/sound"
-  mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/cataclysm-dda-musicpack_coag-musicpack"
-  install -Dm644 "$srcdir/cataclysm-dda-musicpack_coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-dda/sound/cataclysm-dda-soundpack_damalsksoundpack/musicset.json"
-  cp -r "$srcdir/cataclysm-dda-musicpack_coag-musicpack/music" "$pkgdir/usr/share/cataclysm-dda/sound/cataclysm-dda-soundpack_damalsksoundpack"
+  mv "$srcdir/cataclysm-dda-tileset_msx-tileset-master" "$srcdir/msx-tileset"
+  cp -r "$srcdir/msx-tileset" "$pkgdir/usr/share/cataclysm-dda/gfx"
+  mv "$srcdir/cataclysm-dda-mod_msx-tileset-fix-master" "$srcdir/msx-tileset-fix"
+  cp -r "$srcdir/msx-tileset-fix" "$pkgdir/usr/share/cataclysm-dda/mods"
+  mv "$srcdir/cataclysm-dda-soundpack_damalsksoundpack-master" "$srcdir/damalsksoundpack"
+  cp -r "$srcdir/damalsksoundpack" "$pkgdir/usr/share/cataclysm-dda/sound"
+  mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/coag-musicpack"
+  install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-dda/sound/damalsksoundpack/musicset.json"
+  cp -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-dda/sound/damalsksoundpack"
 
   # hack: remove overlapping files
   cd "$pkgdir/../cataclysm-dda"