summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiab Neiroukh2020-04-26 15:48:34 +0100
committerDiab Neiroukh2020-04-26 15:48:34 +0100
commit36d8a431d931b9f184666102a0a60de452018ae1 (patch)
tree1071a4bd26ee24a27b0ef1d7f952ab4cc3d89579
parent50aec6569e714c4e010d2e0e544dbf6aa0f21aca (diff)
downloadaur-36d8a431d931b9f184666102a0a60de452018ae1.tar.gz
🐛 FIX: Correct provides and conflicts
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD23
2 files changed, 14 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0fbd2e4f0e2a..4e20c6c7b68b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nginx-zest-git
pkgver = 1.17.10
- pkgrel = 2
+ pkgrel = 3
epoch = 2
url = https://github.com/ZestProjects/nginx
arch = x86_64
@@ -64,25 +64,24 @@ pkgname = nginx-zest-git
optdepends = nginx-zest-src-git: dynamic module support
provides = nginx=1.17.10
provides = nginx-mod-brotli
- provides = nginx-mod-cookieflag
- provides = nginx-mod-devel
+ provides = nginx-mod-ndk
provides = nginx-mod-ipscrub
+ provides = nginx-mod-ndk
provides = nginx-mod-njs
provides = nginx-mod-redis=0.3.9
provides = nginx-mod-redis2
- provides = nginx-mod-setmisc
+ provides = nginx-mod-set-misc
provides = nginx-mod-srcache
provides = nginx-zest=1.17.10
conflicts = nginx
conflicts = nginx-mod-brotli
- conflicts = nginx-mod-cookieflag
- conflicts = nginx-mod-devel
+ conflicts = nginx-mod-ndk
conflicts = nginx-mod-ipscrub
+ conflicts = nginx-mod-ndk
conflicts = nginx-mod-njs
conflicts = nginx-mod-redis
conflicts = nginx-mod-redis2
- conflicts = nginx-mod-sethash
- conflicts = nginx-mod-setmisc
+ conflicts = nginx-mod-set-misc
conflicts = nginx-mod-srcache
conflicts = nginx-zest
backup = etc/logrotate.d/nginx
diff --git a/PKGBUILD b/PKGBUILD
index 25580f0f3844..196c862d3313 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(
"nginx-zest-src-git"
)
pkgver=1.17.10
-pkgrel=2
+pkgrel=3
epoch=2
arch=(
"x86_64"
@@ -108,10 +108,6 @@ _zest_flags=(
--add-module="../nginx_cookie_flag_module"
--add-module="../ngx_brotli"
--add-module="../ngx_http_redis-0.3.9"
-
- #! The set_hash module breaks compilation
- #--add-module="../ngx_http_set_hash"
-
--add-module="../njs/nginx"
--add-module="../redis2-nginx-module"
--add-module="../set-misc-nginx-module"
@@ -198,31 +194,26 @@ package_nginx-zest-git()
provides=(
"nginx=1.17.10"
"nginx-mod-brotli"
- "nginx-mod-cookieflag"
- "nginx-mod-devel"
+ "nginx-mod-ndk"
"nginx-mod-ipscrub"
+ "nginx-mod-ndk"
"nginx-mod-njs"
"nginx-mod-redis=0.3.9"
"nginx-mod-redis2"
-
- #! This module is currently not built
- #"nginx-mod-sethash"
-
- "nginx-mod-setmisc"
+ "nginx-mod-set-misc"
"nginx-mod-srcache"
"nginx-zest=1.17.10"
)
conflicts=(
"nginx"
"nginx-mod-brotli"
- "nginx-mod-cookieflag"
- "nginx-mod-devel"
+ "nginx-mod-ndk"
"nginx-mod-ipscrub"
+ "nginx-mod-ndk"
"nginx-mod-njs"
"nginx-mod-redis"
"nginx-mod-redis2"
- "nginx-mod-sethash"
- "nginx-mod-setmisc"
+ "nginx-mod-set-misc"
"nginx-mod-srcache"
"nginx-zest"
)