Fix spec file, add libmaxminddb to Requires

This commit is contained in:
eabdullin 2022-07-15 15:53:58 +03:00
parent 0bbf5e7aa0
commit 93abe7fd49
2 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/nginx-1.20.1.tar.gz SOURCES/nginx-1.20.1.tar.gz
SOURCES/ngx_http_geoip2_module-3.4.tar

View File

@ -30,7 +30,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.20.1 Version: 1.20.1
Release: 1%{?dist}.alma Release: 1%{?dist}.alma.plus
Summary: A high performance web server and reverse proxy server Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -143,8 +143,10 @@ directories.
Group: System Environment/Daemons Group: System Environment/Daemons
Summary: Nginx HTTP geoip module Summary: Nginx HTTP geoip module
BuildRequires: GeoIP-devel BuildRequires: GeoIP-devel
BuildRequires: libmaxminddb-devel
Requires: nginx(abi) = %{nginx_abiversion} Requires: nginx(abi) = %{nginx_abiversion}
Requires: GeoIP Requires: GeoIP
Requires: libmaxminddb
%description mod-http-geoip2 %description mod-http-geoip2
%{summary}. %{summary}.
@ -211,6 +213,7 @@ Requires: gperftools-devel
%endif %endif
%if %{with geoip} %if %{with geoip}
Requires: GeoIP-devel Requires: GeoIP-devel
Requires: libmaxminddb-devel
%endif %endif
Requires: libxslt-devel Requires: libxslt-devel
Requires: openssl-devel Requires: openssl-devel
@ -224,7 +227,7 @@ Requires: zlib-devel
%prep %prep
%setup -T -D -b 1 %setup -T -D -b 0 -b 1
%patch0 -p0 %patch0 -p0
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
@ -278,8 +281,7 @@ export DESTDIR=%{buildroot}
--with-http_xslt_module=dynamic \ --with-http_xslt_module=dynamic \
--with-http_image_filter_module=dynamic \ --with-http_image_filter_module=dynamic \
%if %{with geoip} %if %{with geoip}
--add-dynamic-module=%{builddir}/ngx_http_geoip2_module-3.4 --add-dynamic-module=%{_builddir}/ngx_http_geoip2_module-3.4 \
# --with-http_geoip_module=dynamic \
%endif %endif
--with-http_sub_module \ --with-http_sub_module \
--with-http_dav_module \ --with-http_dav_module \
@ -508,6 +510,7 @@ fi
%files mod-http-geoip2 %files mod-http-geoip2
%{nginx_moduleconfdir}/mod-http-geoip2.conf %{nginx_moduleconfdir}/mod-http-geoip2.conf
%{nginx_moduledir}/ngx_http_geoip2_module.so %{nginx_moduledir}/ngx_http_geoip2_module.so
%{nginx_moduledir}/ngx_stream_geoip2_module.so
%endif %endif
%files mod-http-image-filter %files mod-http-image-filter
@ -541,7 +544,7 @@ fi
%{nginx_srcdir}/ %{nginx_srcdir}/
%changelog %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 - Update geoip to geoip2
* Mon Jan 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.20.1-1.alma * Mon Jan 31 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.20.1-1.alma