Upgrade to 2.25.0

PKGBUILD:
Simplify installation of files using find.

2 files changed, 15 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edef76759f53..d23a3b27ecff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mantisbt
 	pkgdesc = Web-based issue tracking system
-	pkgver = 2.24.4
+	pkgver = 2.25.0
 	pkgrel = 1
 	url = https://www.mantisbt.org/
 	install = mantisbt.install
@@ -13,21 +13,21 @@ pkgbase = mantisbt
 	optdepends = php-gd: generate captcha
 	optdepends = php-pgsql: use PostgreSQL database backend
 	optdepends = postgresql: use local PostgreSQL database
-	optdepends = uwsgi: run as application container
+	optdepends = uwsgi-plugin-php: run as application container
 	backup = etc/webapps/mantisbt/config_inc.php
 	backup = etc/webapps/mantisbt/custom_strings_inc.php
 	backup = etc/webapps/mantisbt/custom_relationships_inc.php
 	backup = etc/webapps/mantisbt/custom_functions_inc.php
 	backup = etc/webapps/mantisbt/custom_constants_inc.php
-	source = https://downloads.sourceforge.net/project/mantisbt/mantis-stable/2.24.4/mantisbt-2.24.4.tar.gz
+	source = https://downloads.sourceforge.net/project/mantisbt/mantis-stable/2.25.0/mantisbt-2.25.0.tar.gz
 	source = mantisbt.sysusers
 	source = mantisbt.tmpfiles
 	source = mantisbt.uwsgi
-	sha512sums = 115ae7786061b9a535a8396ee32e8aea31ac0d934f64fa614de757cdc1547beefe1d363867be663a1d974c0d94e29708b2b65f52abd2e85eaaefa3bb32c4bf8e
+	sha512sums = c8276199f56f954c1867a1b3abe664e62552cb4eccc7b5bcb7f9f8ca27b895eec94af9ad099f977c161b7a3a500803458524875a4c9adf213c10f6b0b4a9fe39
 	sha512sums = 3fd4e7faad7774892abfd20006ae3efcd7b0ba315447da9cea8d7352d5fd1e7f0c558d3855ad4e667a0bfe6ae0d95d12c848a78d53312521a7f551f2edca723e
 	sha512sums = b1b9145d1ba423055d5e45734a9d74c639b75ae5b5d580024b50626332a74830dd39b976de590549ff1c47c400ba4e1c20b27b69fb140f7d8527d8d281d0c7bd
 	sha512sums = 1b36d8956986360306eb15a9279c54eba46e74dfe0623dc26b3be3e8f409ab4f0afe6b34a9001cbeb9f33452fec5ccc8089a53352fa885894cc262ca9c12bc39
-	b2sums = 935bfba0098c0cff7dffa8ed6d9824abc5771f4e528336892e72295b242358279f4b61dd1b399cc8a65cc999cb13bafc66cc55e92926232a04bd1f07d5b542ee
+	b2sums = c4e75d28b3b0f4f80a4c51545ee2531ee5c587494b80b0d75eb60cda35a36e0aae699796b744be95d1dc3115039fab22e44b3ce00ec81c8d2f107735b348a022
 	b2sums = a533265d7bbbf1ae059a128baa43fb639e803094c62179252b416957fcfdb43a6068182d2bf29003c8fa55757a95bb1c3f054622bb0926055819c5dc989fe067
 	b2sums = c70218e3aae3f7af3d5e7989545f3a21b93c0eae80d40ea2f89571d4a6d9181ec069323478fa20f6db66137f0c26777dceb37d19aeccc2351229dc8be3fc4417
 	b2sums = 2aa889fc1ded36b4229c3c77fad20c9699604f7d67bcecf09b0ba7cb81e01c0ba0cf309195475d6f96a28016bc2941e7241c4fce75db97056f77cbbe12d4e3bc
diff --git a/PKGBUILD b/PKGBUILD
index b2b93e0f35bf..26527ed0b308 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Angel 'angvp' Velasquez <angvp@archlinux.com.ve>
 
 pkgname=mantisbt
-pkgver=2.24.4
+pkgver=2.25.0
 pkgrel=1
 pkgdesc='Web-based issue tracking system'
 arch=('any')
@@ -19,7 +19,7 @@ optdepends=('curl: interface Twitter'
             'php-gd: generate captcha'
             'php-pgsql: use PostgreSQL database backend'
             'postgresql: use local PostgreSQL database'
-            'uwsgi: run as application container')
+            'uwsgi-plugin-php: run as application container')
 backup=('etc/webapps/mantisbt/config_inc.php'
         'etc/webapps/mantisbt/custom_strings_inc.php'
         'etc/webapps/mantisbt/custom_relationships_inc.php'
@@ -32,11 +32,11 @@ source=("https://downloads.sourceforge.net/project/${pkgname}/mantis-stable/${pk
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
         "${pkgname}.uwsgi")
-sha512sums=('115ae7786061b9a535a8396ee32e8aea31ac0d934f64fa614de757cdc1547beefe1d363867be663a1d974c0d94e29708b2b65f52abd2e85eaaefa3bb32c4bf8e'
+sha512sums=('c8276199f56f954c1867a1b3abe664e62552cb4eccc7b5bcb7f9f8ca27b895eec94af9ad099f977c161b7a3a500803458524875a4c9adf213c10f6b0b4a9fe39'
             '3fd4e7faad7774892abfd20006ae3efcd7b0ba315447da9cea8d7352d5fd1e7f0c558d3855ad4e667a0bfe6ae0d95d12c848a78d53312521a7f551f2edca723e'
             'b1b9145d1ba423055d5e45734a9d74c639b75ae5b5d580024b50626332a74830dd39b976de590549ff1c47c400ba4e1c20b27b69fb140f7d8527d8d281d0c7bd'
             '1b36d8956986360306eb15a9279c54eba46e74dfe0623dc26b3be3e8f409ab4f0afe6b34a9001cbeb9f33452fec5ccc8089a53352fa885894cc262ca9c12bc39')
-b2sums=('935bfba0098c0cff7dffa8ed6d9824abc5771f4e528336892e72295b242358279f4b61dd1b399cc8a65cc999cb13bafc66cc55e92926232a04bd1f07d5b542ee'
+b2sums=('c4e75d28b3b0f4f80a4c51545ee2531ee5c587494b80b0d75eb60cda35a36e0aae699796b744be95d1dc3115039fab22e44b3ce00ec81c8d2f107735b348a022'
         'a533265d7bbbf1ae059a128baa43fb639e803094c62179252b416957fcfdb43a6068182d2bf29003c8fa55757a95bb1c3f054622bb0926055819c5dc989fe067'
         'c70218e3aae3f7af3d5e7989545f3a21b93c0eae80d40ea2f89571d4a6d9181ec069323478fa20f6db66137f0c26777dceb37d19aeccc2351229dc8be3fc4417'
         '2aa889fc1ded36b4229c3c77fad20c9699604f7d67bcecf09b0ba7cb81e01c0ba0cf309195475d6f96a28016bc2941e7241c4fce75db97056f77cbbe12d4e3bc')
@@ -46,8 +46,6 @@ prepare() {
   cd "${pkgname}-${pkgver}"
   # create customization files
   touch "${srcdir}/custom_"{constants,functions,relationships,strings}_inc.php
-  find . -type f -exec chmod -c 0644 {} \;
-  find . -type d -exec chmod -c 0755 {} \;
   # remove useless scripts
   find "vendor" -type f -iname "*.py" -delete
 }
@@ -57,115 +55,18 @@ package() {
   # configuration
   install -vDm 640 config/config_inc.php.sample \
     "${pkgdir}/etc/webapps/${pkgname}/config_inc.php"
-  install -vDm 644 ${srcdir}/*.php -t "${pkgdir}/etc/webapps/${pkgname}"
+  rm -v config/config_inc.php.sample
+  install -vDm 644 ../*.php -t "${pkgdir}/etc/webapps/${pkgname}"
+  # doc
+  install -vDm 644 readme.md -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  rm -v readme.md
   # web application
-  install -vDm 644 *.{php,sample} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}"
-  install -vDm 644 admin/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/admin"
-  install -vDm 644 admin/check/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/admin/check"
-  install -vDm 644 api/rest/{.htaccess,*.{config,json,php}} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/api/rest"
-  install -vDm 644 api/rest/restcore/{.htaccess,*.php} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/api/rest/restcore"
-  install -vDm 644 api/soap/*.{php,wsdl,xsl} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/api/soap"
-  install -vDm 644 config/{.htaccess,*.config} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/config"
-  install -vDm 644 core/{.htaccess,*.{php,config}} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/core"
-  install -vDm 644 core/cfdefs/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/core/cfdefs"
-  install -vDm 644 core/classes/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/core/classes"
-  install -vDm 644 core/commands/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/core/commands"
-  install -vDm 644 core/exceptions/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/core/exceptions"
-  install -vDm 644 css/*.{css,php} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/css"
-  install -vDm 644 css/images/*.{gif,jpg,png} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/css/images"
-  install -vDm 644 doc/{.htaccess,*.{config,png,txt}} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/doc"
-  for _guide in Admin_Guide; do
-    install -vDm 644 doc/en-US/${_guide}/*.{pdf,txt} \
-      -t "${pkgdir}/usr/share/webapps/${pkgname}/doc/en-US/${_guide}"
-    for _html_type in {html-desktop,html-single-plain}; do
-      install -vDm 644 doc/en-US/${_guide}/${_html_type}/*.html \
-        -t "${pkgdir}/usr/share/webapps/${pkgname}/doc/en-US/${_guide}/${_html_type}"
-      install -vDm 644 doc/en-US/${_guide}/${_html_type}/Common_Content/css/*.css \
-        -t "${pkgdir}/usr/share/webapps/${pkgname}/doc/en-US/${_guide}/${_html_type}/Common_Content/css"
-      install -vDm 644 doc/en-US/${_guide}/${_html_type}/Common_Content/images/*.{png,svg} \
-        -t "${pkgdir}/usr/share/webapps/${pkgname}/doc/en-US/${_guide}/${_html_type}/Common_Content/images"
-      install -vDm 644 doc/en-US/${_guide}/${_html_type}/images/*.png \
-        -t "${pkgdir}/usr/share/webapps/${pkgname}/doc/en-US/${_guide}/${_html_type}/images"
-    done
-  done
-  install -vDm 644 fonts/{.htaccess,*.{eot,svg,ttf,woff,woff2}} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/fonts"
-  install -vDm 644 images/*.{gif,ico,png} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/images"
-  install -vDm 644 js/*.js \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/js"
-  install -vDm 644 lang/{.htaccess,README,*.{config,txt}} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/lang"
-  install -vDm 644 library/{.htaccess,README.md,*.config} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/library"
-  install -vDm 644 library/rssbuilder/*.{html,php,txt} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/library/rssbuilder"
-  install -vDm 644 library/rssbuilder/doc/*.{css,htm} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/library/rssbuilder/doc"
-  install -vDm 644 plugins/{.htaccess,*.config} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins"
-  install -vDm 644 plugins/Gravatar/*.{php,md} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/Gravatar"
-  install -vDm 644 plugins/Gravatar/lang/*.txt \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/Gravatar/lang"
-  install -vDm 644 plugins/MantisCoreFormatting/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisCoreFormatting"
-  install -vDm 644 plugins/MantisCoreFormatting/core/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisCoreFormatting/core"
-  install -vDm 644 plugins/MantisCoreFormatting/lang/*.txt \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisCoreFormatting/lang"
-  install -vDm 644 plugins/MantisCoreFormatting/pages/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisCoreFormatting/pages"
-  install -vDm 644 plugins/MantisGraph/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisGraph"
-  install -vDm 644 plugins/MantisGraph/core/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisGraph/core"
-  install -vDm 644 plugins/MantisGraph/files/*.js \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisGraph/files"
-  install -vDm 644 plugins/MantisGraph/lang/*.txt \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisGraph/lang"
-  install -vDm 644 plugins/MantisGraph/pages/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/MantisGraph/pages"
-  install -vDm 644 plugins/XmlImportExport/*.{php,dtd} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/XmlImportExport"
-  install -vDm 644 plugins/XmlImportExport/ImportXml/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/XmlImportExport/ImportXml"
-  install -vDm 644 plugins/XmlImportExport/lang/*.txt \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/XmlImportExport/lang"
-  install -vDm 644 plugins/XmlImportExport/pages/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/plugins/XmlImportExport/pages"
-  install -vDm 644 scripts/{.htaccess,*.{config,md,php}} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/scripts"
-  install -vDm 755 scripts/*.sh \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/scripts"
-  # webapp vendor
-  install -vDm 644 vendor/.htaccess \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/vendor"
-  cp -av --no-preserve='ownership' ../${pkgname}-${pkgver}/vendor/* \
-    "${pkgdir}/usr/share/webapps/${pkgname}/vendor"
+  find . -type f -exec install -vDm 644 {} "${pkgdir}/usr/share/webapps/${pkgname}/"{} \;
   # symlink configuration and customization
   for config in {config,custom_{constants,functions,relationships,strings}}_inc.php ;do
     ln -sv "/etc/webapps/${pkgname}/${config}" \
       "${pkgdir}/usr/share/webapps/${pkgname}/config/${config}"
   done
-  # doc
-  install -vDm 644 readme.md -t "${pkgdir}/usr/share/doc/${pkgname}/"
-
   # tmpfiles.d
   install -vDm 644 "../${pkgname}.tmpfiles" \
     "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"