v3.4.1-5

1 files changed, 16 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e7d57686c018..f01f3cbe4fd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgdesc="Geocoding tool using OpenStreetmap data"
 url="https://nominatim.org"
 
 pkgver=3.4.1
-pkgrel=4
+pkgrel=5
 
 arch=("x86_64")
 license=("GPL2")
@@ -49,17 +49,19 @@ source=(
     "${pkgname}.sysusers"
     "${pkgname}.tmpfiles"
     "apache.conf"
+    "php.ini"
     "settings-local.php"
     "webapps-paths.patch"
 )
 sha256sums=(
     "eea1e0e4bd0fd5c9408a734e3ad687879fbcdf670edbfa7c678daf7dc1d0fae2"
-    "79499b5d2a4c364f3e658e837e315644023cf120eca6b7c368aa059ab6b5082d"
+    "0be6ea5234b8622854e6147aa22afd7adfe15546ee1b514acde1654f44e75148"
     "7db2c5ff31954c02421fadd06b6758e181a7028f5ac73b16f3abdcb4caef6879"
     "1999cb2bb75046a4ea1b326082a4c1cf5de54f12ed36b1d22540c842c7c30b9d"
     "8dd94ea1a88156bc55dc41e4f4df878df4f28c23c31bfda36c89470e2f5997d0"
-    "df040410ab16df4e45c14b3c3857b58d995e8a4a73dbc111612426617e68f53a"
-    "c056160b4d7ec1ed43905a6d13f265f4c726ed660b819091ba17786aca525477"
+    "1bf1328abbc9b7453800d3e408ae14ea22d0d4ba9dc6d49b21a0e3121a6fbd49"
+    "a1f3c804b2066501554c2e3af0dff3b9b16a3f89117b7e4c5e45e9c858747f74"
+    "26c0cf16dd4fe2ce597a9495f5161d78a9f1f5276d8c3cf60b26b40b56caf8f1"
 )
 install="${pkgname}.install"
 
@@ -96,34 +98,34 @@ package() {
         "data-sources" \
         "lib" \
         "munin" \
+	"settings" \
         "sql" \
         "utils" \
         "wikidata"
     do
         install \
             -Ddm755 \
-            "${srcdir}/Nominatim-${pkgver}/${_dir}" \
-            "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}"
+            "${pkgdir}/usr/share/webapps/${pkgname}/src/${_dir}"
         cp \
-            -aR \
+            -avR \
             "${srcdir}/Nominatim-${pkgver}/${_dir}" \
-            "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}"
+            "${pkgdir}/usr/share/webapps/${pkgname}/src/"
     done
 
     # directories to copy from build dir
-    for dir in \
+    for _dir in \
         "settings" \
+	"utils" \
         "website"
     do
         install \
             -Ddm755 \
-            "${srcdir}/build/${_dir}" \
             "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}"
 
         cp \
-            -aR \
+            -avR \
             "${srcdir}/build/${_dir}" \
-            "${pkgdir}/usr/share/webapps/${pkgname}/${_dir}"
+            "${pkgdir}/usr/share/webapps/${pkgname}/"
     done
 
     install -Dm755 "${srcdir}/build/module/nominatim.so" -t "${pkgdir}/usr/share/webapps/${pkgname}/module/"
@@ -134,6 +136,8 @@ package() {
     install -Dm644 "${srcdir}/apache.conf" -t "${pkgdir}/etc/webapps/${pkgname}"
     install -Dm644 "${srcdir}/settings-local.php" "${pkgdir}/usr/share/webapps/${pkgname}/settings/local.php"
 
+    install -Dm644 "${srcdir}/php.ini" "${pkgdir}/etc/php/conf.d/nominatim.ini"
+
     install -Dm 644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
     install -Dm 644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }