Update to 2.81.0

4 files changed, 33 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 652ce28d25b9..cf8dfe73f335 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = etlegacy32-bin
 	pkgdesc = Wolfenstein: Enemy Territory 2.60b compatible client/server (etlegacy engine, 32 bit), binary release
-	pkgver = 2.80.2
-	pkgrel = 2
+	pkgver = 2.81.0
+	pkgrel = 1
 	url = http://www.etlegacy.com/
 	install = etlegacy.install
 	arch = i686
@@ -21,11 +21,11 @@ pkgbase = etlegacy32-bin
 	backup = etc/xdg/etlegacy/etlegacy.conf
 	source = etl_start.sh
 	source = etlded_start.sh
-	source = https://www.etlegacy.com/download/file/410
-	source = https://github.com/etlegacy/etlegacy/archive/refs/tags/v2.80.2.tar.gz
-	md5sums = f31746c1e62680f47d085919fe2cf8a8
-	md5sums = 58fd6c4c81894309184af839e689bd2d
-	md5sums = a8c32bd1742be1884eb8898932960770
-	md5sums = 995cc17a5c34516ba88310d5c6bb387a
+	source = https://www.etlegacy.com/download/file/539
+	source = https://github.com/etlegacy/etlegacy/archive/refs/tags/v2.81.0.tar.gz
+	md5sums = 5dc7a1fe4129a7ca2dd4b1dc15b0ae4d
+	md5sums = f63392f27b823020dfbce3150e9adf53
+	md5sums = f3a7daf81754785b2c888c3f6d15e36e
+	md5sums = 37260857118dc97aec1b37fafed7e7fb
 
 pkgname = etlegacy32-bin
diff --git a/PKGBUILD b/PKGBUILD
index 255a5e5c4165..f78d0ea9f8d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 _pkgbase=etlegacy
 pkgname=etlegacy32-bin
 pkgdesc="Wolfenstein: Enemy Territory 2.60b compatible client/server (etlegacy engine, 32 bit), binary release"
-pkgver=2.80.2
-pkgrel=2
+pkgver=2.81.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.etlegacy.com/"
 provides=('etlegacy')
@@ -21,50 +21,54 @@ license=('GPL3')
 source=(
     "etl_start.sh"
     "etlded_start.sh"
-    "https://www.etlegacy.com/download/file/410"
+    "https://www.etlegacy.com/download/file/539"
     "https://github.com/etlegacy/etlegacy/archive/refs/tags/v$pkgver.tar.gz")
 md5sums=(
-    'f31746c1e62680f47d085919fe2cf8a8'
-    '58fd6c4c81894309184af839e689bd2d'
-    'a8c32bd1742be1884eb8898932960770'
-    '995cc17a5c34516ba88310d5c6bb387a'
+    '5dc7a1fe4129a7ca2dd4b1dc15b0ae4d'
+    'f63392f27b823020dfbce3150e9adf53'
+    'f3a7daf81754785b2c888c3f6d15e36e'
+    '37260857118dc97aec1b37fafed7e7fb'
 )
 
 package() {
     cd "$_pkgbase-v$pkgver-i386"
     install -dm 755 "${pkgdir}"/usr/{bin,lib/${_pkgbase}/,share/{applications,icons,licenses/${_pkgbase},/doc/${_pkgbase}}}
     cp -dr --no-preserve='ownership' ./ "${pkgdir}"/usr/lib/${_pkgbase}/
-    install -Dm 755 "${srcdir}"/etl_start.sh "${pkgdir}"/usr/bin/etl
-    install -Dm 755 "${srcdir}"/etlded_start.sh "${pkgdir}"/usr/bin/etlded
+    # Executables
+    install -Dm 755 "${srcdir}"/etl_start.sh "${pkgdir}"/usr/bin/etl.x86
+    install -Dm 755 "${srcdir}"/etlded_start.sh "${pkgdir}"/usr/bin/etlded.x86
     # Incorrect permissions on install, fix
     chmod 755 -R "${pkgdir}"/usr/lib/"${_pkgbase}"/legacy/omni-bot
     # assets
     ln -s /usr/share/enemy-territory/etmain/{pak0,pak1,pak2}.pk3 $pkgdir/usr/lib/$_pkgbase/etmain/
 
     for i in 16 22 24 32 48 64 128 256 512 1024; do
-        convert -background none  "${srcdir}"/"$_pkgbase-$pkgver"/misc/etl.svg -resize ${i}x${i} -colors 256 "${srcdir}"/"$_pkgbase-$pkgver"/misc/etl.png
-        install -Dvm644 "${srcdir}"/"$_pkgbase-$pkgver"/misc/etl.png \
+        convert -background none  ./icons/hicolor/scalable/apps/etl.svg -resize ${i}x${i} -colors 256 ./icons/etl.png
+        install -Dvm644 ./icons/etl.png \
           "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/etl.png"
     done
 
-    install -Dvm644 "${srcdir}"/"$_pkgbase-$pkgver"/misc/etl.svg \
+    install -Dvm644 ./icons/hicolor/scalable/apps/etl.svg \
           "$pkgdir/usr/share/icons/hicolor/scalable/apps/etl.svg"
-    
-    # application entry
-    cp -dr --no-preserve='ownership' "${srcdir}"/"$_pkgbase-$pkgver"/misc/com.etlegacy.ETLegacy.desktop "${pkgdir}"/usr/share/applications/
+
+    # manpages
+    cp -dr --no-preserve='ownership' "./man" "${pkgdir}"/usr/share/
+
+    # applications
+    cp -dr --no-preserve='ownership' "./applications" "${pkgdir}"/usr/share/
+
+    #licenses
+    cp -dr --no-preserve='ownership' "./licenses" "${pkgdir}"/usr/share/
 
     # doc
     mkdir -p $pkgdir/usr/share/doc/$_pkgbase
     install -m 644 "${srcdir}"/"$_pkgbase-$pkgver"/docs/game/anticheat.html $pkgdir/usr/share/doc/$_pkgbase/
 
-    # license
-    mkdir -p $pkgdir/usr/share/licenses/$_pkgbase
-
     # systemd
     mkdir -p $pkgdir/etc/xdg/$_pkgbase/etmain
     mkdir -p $pkgdir/usr/lib/systemd/system
     install -m 644 "${srcdir}"/"$_pkgbase-$pkgver"/misc/etlegacy.conf $pkgdir/etc/xdg/$_pkgbase/
-    install -m 644 "${srcdir}"/"$_pkgbase-$pkgver"/misc/etlegacy.service $pkgdir/usr/lib/systemd/system/
+    install -m 644 "${srcdir}"/"$_pkgbase-$pkgver"/misc/etlegacy-x86.service $pkgdir/usr/lib/systemd/system/
 
     # config
     mv $pkgdir/usr/lib/$_pkgbase/etmain/*.cfg $pkgdir/etc/xdg/$_pkgbase/etmain/
diff --git a/etl_start.sh b/etl_start.sh
index 0a17a60ae4ca..5f07b5ac6ae2 100755
--- a/etl_start.sh
+++ b/etl_start.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd /usr/lib/etlegacy
-./etl_bot.sh "$@"
\ No newline at end of file
+./etl_bot_x86.sh "$@"
\ No newline at end of file
diff --git a/etlded_start.sh b/etlded_start.sh
index 4dc3364e277d..a29f141b3077 100755
--- a/etlded_start.sh
+++ b/etlded_start.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd /usr/lib/etlegacy
-./etlded_bot.sh "$@"
\ No newline at end of file
+./etlded_bot_x86.sh "$@"
\ No newline at end of file