update the package to version 2.9.0

5 files changed, 45 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6bd222a5d16..315fd7392388 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = android-apktool-bin
 	pkgdesc = A tool for reverse engineering Android apk files
-	pkgver = 2.8.1
+	pkgver = 2.9.0
 	pkgrel = 1
 	url = https://github.com/iBotPeaches/Apktool
-	changelog = Changelog
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = Apache
 	depends = java-runtime>=8
 	provides = android-apktool
 	conflicts = android-apktool
 	conflicts = android-apktool-git
-	noextract = apktool_2.8.1.jar
-	source = https://github.com/iBotPeaches/Apktool/releases/download/v2.8.1/apktool_2.8.1.jar
+	noextract = apktool_2.9.0.jar
+	source = https://github.com/iBotPeaches/Apktool/releases/download/v2.9.0/apktool_2.9.0.jar
 	source = apktool
-	sha256sums = 7b4a8e1703e228d206db29644b71141687d8a111b55b039b08b02dfa443ab0f9
-	sha256sums = f1d4cf2eb2d12512dbbe583cd7fb35b8b8a44e0e3a1d5e88015ab01d9bc1ce62
+	md5sums = 246e7208cfb92c73d21e4e6a8909dda1
+	md5sums = 2d55a165b924e5bbe2dd1d4427f128fd
 
 pkgname = android-apktool-bin
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..fa4f90a5f460
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# Source and package folders
+src/
+pkg/
+
+# Archive files
+*.zip
+*.tar.gz
+*.tar.xz
+
+# Java files
+*.jar
+
+# Package files
+*.zst
\ No newline at end of file
diff --git a/Changelog b/Changelog
deleted file mode 100644
index 839faf9564be..000000000000
--- a/Changelog
+++ /dev/null
@@ -1,14 +0,0 @@
-v2.8.1
-
-	- feat: Upgrade gradle to v8.2.1 by @ArjunaKumarMohanta in #3141
-	- build(deps): bump gradle/gradle-build-action from 2.5.1 to 2.6.0 by @dependabot in #3151
-	- fix: skip files if cleaned to empty filename by @iBotPeaches in #3166
-	- fix: opt out of stricter java rules for zip64 and dot entries by @iBotPeaches in #3178
-	- build: test on java20 by @iBotPeaches in #3177
-	- Correct regressions towards apktool.yml generation by @iBotPeaches in #3172
-	- Allows run app from gradle for debugging purposes by @sv99 in #3179
-	- fix: add missing hasResources check by @IgorEisberg in #3182
-	- Prevent loading from resource pool if type is not a resolveable resource by @iBotPeaches in #3187
-	- style: normalize command descs and redundancy by @IgorEisberg in #3188
-	- fix: crash when decompiling framework-res.apk with a tag (regression) by @IgorEisberg in #3193
-
diff --git a/PKGBUILD b/PKGBUILD
index 7c4d554d8190..2a096bd89bba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,31 @@
 
 _pkgname=android-apktool
 pkgname=${_pkgname}-bin
-pkgver=2.8.1
+
+pkgdesc="A tool for reverse engineering Android apk files"
+
+pkgver=2.9.0
 pkgrel=1
-pkgdesc='A tool for reverse engineering Android apk files'
-arch=('any')
-url='https://github.com/iBotPeaches/Apktool'
-license=('Apache')
-depends=('java-runtime>=8')
-conflicts=('android-apktool' 'android-apktool-git')
-provides=('android-apktool')
-source=("https://github.com/iBotPeaches/Apktool/releases/download/v${pkgver}/apktool_${pkgver}.jar"
-        'apktool')
+
+arch=(i686 x86_64)
+
+url="https://github.com/iBotPeaches/Apktool"
+license=("Apache")
+
+depends=("java-runtime>=8")
+
+provides=(android-apktool)
+conflicts=(android-apktool android-apktool-git)
+
+source=("https://github.com/iBotPeaches/Apktool/releases/download/v${pkgver}/apktool_${pkgver}.jar" "apktool")
+md5sums=("246e7208cfb92c73d21e4e6a8909dda1" "2d55a165b924e5bbe2dd1d4427f128fd")
+
 noextract=("apktool_${pkgver}.jar")
-sha256sums=('7b4a8e1703e228d206db29644b71141687d8a111b55b039b08b02dfa443ab0f9'
-            'f1d4cf2eb2d12512dbbe583cd7fb35b8b8a44e0e3a1d5e88015ab01d9bc1ce62')
-changelog=Changelog
 
 package() {
-  install -Dm 0755 "${srcdir}/apktool" "${pkgdir}/usr/bin/apktool"
-  install -Dm 0644 "${srcdir}/apktool_${pkgver}.jar" "${pkgdir}/usr/share/${_pkgname}/apktool.jar"
+    # copy the main .jar file
+    install -Dm644 "apktool_${pkgver}.jar" "${pkgdir}/usr/share/java/${_pkgname}/apktool.jar"
+
+    # copy the executable script
+    install -Dm755 "apktool" "${pkgdir}/usr/bin/apktool"
 }
diff --git a/apktool b/apktool
index 676eb5b105ab..6172c142a617 100755
--- a/apktool
+++ b/apktool
@@ -43,7 +43,7 @@ cd "${oldwd}"
 
 
 jarfile=apktool.jar
-libdir="/usr/share/android-apktool"
+libdir="/usr/share/java/android-apktool"
 if [ ! -r "$libdir/$jarfile" ]
 then
     echo `basename "$prog"`": can't find $jarfile"