Massimiliano Torromeo pushed to branch main at Arch Linux / Packaging / 
Packages / nginx-mod-ndk-set-misc


Commits:
6d58d1ba by David Runge at 2025-01-15T14:50:56+01:00
Fix SRCINFO output for nginx dependency

Signed-off-by: David Runge <dv...@archlinux.org>

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -15,9 +15,9 @@ pkgbase = nginx-mod-ndk-set-misc
 
 pkgname = nginx-mod-ndk
        pkgdesc = Nginx module that adds additional generic tools that module 
developers can use in their own modules
-       depends = nginx=
+       depends = nginx
 
 pkgname = nginx-mod-set-misc
        pkgdesc = Nginx module that adds various set_xxx directives
        depends = nginx-mod-ndk
-       depends = nginx=
+       depends = nginx


=====================================
PKGBUILD
=====================================
@@ -39,9 +39,12 @@ build() {
 
 package_nginx-mod-ndk() {
        pkgdesc="Nginx module that adds additional generic tools that module 
developers can use in their own modules"
-       local _nginx_version=$(nginx -v 2>&1)
-       _nginx_version=${_nginx_version/* nginx\/}
-       depends+=("nginx=${_nginx_version}")
+       if [[ "$BUILDTOOL" == devtools ]]; then
+               local nginx_dep="nginx=$(nginx -v 2>&1 | sed 's|.*/||')"
+               depends+=($nginx_dep)
+       else
+               depends+=(nginx)
+       fi
 
        cd build/objs
        install -Dm755 ndk_http_module.so 
"$pkgdir"/usr/lib/nginx/modules/ndk_http_module.so
@@ -53,9 +56,12 @@ package_nginx-mod-ndk() {
 package_nginx-mod-set-misc() {
        pkgdesc="Nginx module that adds various set_xxx directives"
        depends=('nginx-mod-ndk')
-       local _nginx_version=$(nginx -v 2>&1)
-       _nginx_version=${_nginx_version/* nginx\/}
-       depends+=("nginx=${_nginx_version}")
+       if [[ "$BUILDTOOL" == devtools ]]; then
+               local nginx_dep="nginx=$(nginx -v 2>&1 | sed 's|.*/||')"
+               depends+=($nginx_dep)
+       else
+               depends+=(nginx)
+       fi
 
        cd build/objs
        install -Dm755 ngx_http_set_misc_module.so 
"$pkgdir"/usr/lib/nginx/modules/ngx_http_set_misc_module.so



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nginx-mod-ndk-set-misc/-/commit/6d58d1bab6e421adb58dd1c1ba673aaa3fdefe86

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nginx-mod-ndk-set-misc/-/commit/6d58d1bab6e421adb58dd1c1ba673aaa3fdefe86
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to