[packages/nginx: 29/29] Merge branch 'dev-dynamic'

[glen]

commit a6b9d68f84e459aa7c8d2a467b45ddf74ffdf414
Merge: 69afa2c ba3249a
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Oct 28 10:47:00 2016 +0300

    Merge branch 'dev-dynamic'
    
    http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-October/025188.html

 nginx-light.service                  |  14 -
 nginx-mail.conf                      |   9 -
 nginx-mail.monitrc                   |  32 --
 nginx-mail.service                   |  14 -
 nginx-perl.monitrc                   |  33 --
 nginx-perl.service                   |  14 -
 nginx-standard.monitrc               |  33 --
 nginx-standard.service               |  14 -
 nginx.conf                           |  49 ++-
 nginx.init                           |  10 +-
 nginx.logrotate                      |  13 +-
 nginx-light.monitrc => nginx.monitrc |  18 +-
 nginx.service                        |  14 +
 nginx.spec                           | 766 ++++++++++++++---------------------
 14 files changed, 362 insertions(+), 671 deletions(-)
---
diff --cc nginx.spec
index 5f1357f,66974cf..39abeac
--- a/nginx.spec
+++ b/nginx.spec
@@@ -38,7 -42,7 +42,7 @@@ Summary(pl.UTF-8):	Serwer HTTP i odwrot
  # - mainline: production quality but API can change
  Name:		nginx
  Version:	1.11.5
- Release:	1
 -Release:	0.10
++Release:	2
  License:	BSD-like
  Group:		Networking/Daemons/HTTP
  Source0:	http://nginx.org/download/%{name}-%{version}.tar.gz
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/a6b9d68f84e459aa7c8d2a467b45ddf74ffdf414