From 93abe7fd4913207cba0e373b75cd87827469a23e Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 15 Jul 2022 15:53:58 +0300
Subject: [PATCH] Fix spec file, add libmaxminddb to Requires

---
 .gitignore       |  1 +
 SPECS/nginx.spec | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e4f490..47e68fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/nginx-1.20.1.tar.gz
+SOURCES/ngx_http_geoip2_module-3.4.tar
\ No newline at end of file
diff --git a/SPECS/nginx.spec b/SPECS/nginx.spec
index 5a231d2..c71d120 100644
--- a/SPECS/nginx.spec
+++ b/SPECS/nginx.spec
@@ -30,7 +30,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.20.1
-Release:           1%{?dist}.alma
+Release:           1%{?dist}.alma.plus
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -143,8 +143,10 @@ directories.
 Group:             System Environment/Daemons
 Summary:           Nginx HTTP geoip module
 BuildRequires:     GeoIP-devel
+BuildRequires:     libmaxminddb-devel
 Requires:          nginx(abi) = %{nginx_abiversion}
 Requires:          GeoIP
+Requires:          libmaxminddb
 
 %description mod-http-geoip2
 %{summary}.
@@ -211,6 +213,7 @@ Requires:          gperftools-devel
 %endif
 %if %{with geoip}
 Requires:          GeoIP-devel
+Requires:          libmaxminddb-devel
 %endif
 Requires:          libxslt-devel
 Requires:          openssl-devel
@@ -224,7 +227,7 @@ Requires:          zlib-devel
 
 
 %prep
-%setup -T -D -b 1
+%setup -T -D -b 0 -b 1
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
@@ -278,8 +281,7 @@ export DESTDIR=%{buildroot}
     --with-http_xslt_module=dynamic \
     --with-http_image_filter_module=dynamic \
 %if %{with geoip}
-    --add-dynamic-module=%{builddir}/ngx_http_geoip2_module-3.4
-    # --with-http_geoip_module=dynamic \
+    --add-dynamic-module=%{_builddir}/ngx_http_geoip2_module-3.4 \
 %endif
     --with-http_sub_module \
     --with-http_dav_module \
@@ -508,6 +510,7 @@ fi
 %files mod-http-geoip2
 %{nginx_moduleconfdir}/mod-http-geoip2.conf
 %{nginx_moduledir}/ngx_http_geoip2_module.so
+%{nginx_moduledir}/ngx_stream_geoip2_module.so
 %endif
 
 %files mod-http-image-filter
@@ -541,7 +544,7 @@ fi
 %{nginx_srcdir}/
 
 %changelog
-* Fri Jul 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.20.1-1.alma.1
+* Fri Jul 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.20.1-1.alma.plus
 - Update geoip to geoip2
 
 * Mon Jan 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.20.1-1.alma