rpms/nginx
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update mainline to 1.17.5

Browse Source 
add conditionals for EL7

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
This commit is contained in:
Felix Kaechele 2019-10-22 15:12:16 -04:00
parent 1721982045
commit e4de074ca3
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nginx.spec
View File

@ -16,13 +16,13 @@
%global with_aio 1
%if 0%{?fedora} > 22
%if 0%{?fedora} > 22 || 0%{?rhel} >= 8
%global with_mailcap_mimetypes 1
%endif
Name: nginx
Epoch: 1
Version: 1.17.4
Version: 1.17.5
Release: 1%{?dist}
Summary: A high performance web server and reverse proxy server
@ -68,7 +68,16 @@ BuildRequires: pcre-devel
BuildRequires: zlib-devel
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
%if 0%{?el7}
# centos-logos el7 does not provide 'system-indexhtml'
Requires: system-logos redhat-indexhtml
# need to remove epel7 geoip sub-package, doesn't work anymore
# https://bugzilla.redhat.com/show_bug.cgi?id=1576034
# https://bugzilla.redhat.com/show_bug.cgi?id=1664957
Obsoletes: nginx-mod-http-geoip <= 1:1.16
%else
Requires: system-logos-httpd
%endif
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
# Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
@ -142,7 +151,7 @@ Requires: gd
%package mod-http-perl
Summary: Nginx HTTP perl module
BuildRequires: perl-devel
%if 0%{?fedora} >= 24
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 7
BuildRequires: perl-generators
%endif
BuildRequires: perl(ExtUtils::Embed)
@ -293,8 +302,17 @@ install -p -m 0644 ./nginx.conf \
%{buildroot}%{_sysconfdir}/nginx
rm -f %{buildroot}%{_datadir}/nginx/html/index.html
%if 0%{?el7}
ln -s ../../doc/HTML/index.html \
%{buildroot}%{_datadir}/nginx/html/index.html
ln -s ../../doc/HTML/img \
%{buildroot}%{_datadir}/nginx/html/img
ln -s ../../doc/HTML/en-US \
%{buildroot}%{_datadir}/nginx/html/en-US
%else
ln -s ../../fedora-testpage/index.html \
%{buildroot}%{_datadir}/nginx/html/index.html
%endif
install -p -m 0644 %{SOURCE102} \
%{buildroot}%{_datadir}/nginx/html
ln -s nginx-logo.png %{buildroot}%{_datadir}/nginx/html/poweredby.png
@ -470,6 +488,10 @@ fi
%changelog
* Tue Oct 22 2019 Felix Kaechele <heffer@fedoraproject.org> - 1:1.17.5-1
- update mainline to 1.17.5
- add conditionals for EL7
* Wed Sep 25 2019 Felix Kaechele <heffer@fedoraproject.org> - 1:1.17.4-1
- update mainline to 1.17.4

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (nginx-1.17.4.tar.gz) = fb7275c47d2416b597415f736771f8f4f3cdbba33728d9ca8ddb56b8266076a5ec5e63c735215a8d022f685b67d663fdaaac0c95db465a82f79f01d502feaa82
SHA512 (nginx-1.17.4.tar.gz.asc) = b2c9486b99bc78acdf6c3c13bb3ee6b07d48b0ddc2bb8e690fbe8f130980889103f0572268e148f63d26c6f9295d54ef27cb2e01c3c51e981ede2ae5e6919951
SHA512 (nginx-1.17.5.tar.gz) = b6799ddce7135646aa1f0b4405bcdab41d5065fbadcdeeb875f6fae4953159aa57b9104afe815748b0aab0e4d532e7771ccce487d7c4519e423d110f3715da7c
SHA512 (nginx-1.17.5.tar.gz.asc) = 593092d01995f151ae435a81ee35c8788985ecea4c26851fb5cbaee4804d41483e0a220a4b03d6e83f852e30f9e8125d52d2379c41a3ab4c267c2fab1404a0a8