From 501734eb99fcab8d53bf0db9ede597703acc0ae5 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Sat, 16 Feb 2013 08:52:47 +0000 Subject: [PATCH] Update to upstream release 1.2.7 --- .gitignore | 2 ++ nginx-1.2.7.tar.gz.asc | 11 +++++++++++ nginx.spec | 29 +++++++++++++++++------------ sources | 3 ++- 4 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 nginx-1.2.7.tar.gz.asc diff --git a/.gitignore b/.gitignore index 7c730cd..d3e0bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ x86_64/ /nginx-1.2.4.tar.gz /nginx-1.2.5.tar.gz /nginx-1.2.6.tar.gz +/nginx-1.2.7.tar.gz +/nginx-1.2.7.tar.gz.asc diff --git a/nginx-1.2.7.tar.gz.asc b/nginx-1.2.7.tar.gz.asc new file mode 100644 index 0000000..6e6c138 --- /dev/null +++ b/nginx-1.2.7.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (FreeBSD) + +iQEcBAABAgAGBQJRGkaOAAoJEFIKmZOhwFL4l8YH/iFOuytA0Ra0QzAMRKPFoLWT +6qi18ERn7lBpaT+4aS6+Wn8KDk9KQf+79tsiJ++xowjLOvqzQGHZIiqFsfJcTWjH +3FEJ8LSmnbpZuF34gYHiPIC4yNWCgs4AjQge1cu/jr0wyQ2RvOdbSnd3rOAlUz5f +3xXReT3avAqVnKm0+fwuaHQX/LpPn/7qcCb9LUSKyhprW5qz3i36mirCFzS8oYx9 +31JogHr3eW3uBnTT/N4rbwiPyur56CgHzihGClAxrPbXIXSCTDqqDk8o39PcyWqC +3aRLmEALYf/OasuNCc8rR+D+XRCLPXC+LmxNrInpqDNqUmlKs9qf+8xk8xPm90E= +=I9Ng +-----END PGP SIGNATURE----- diff --git a/nginx.spec b/nginx.spec index 95b86d0..e866eeb 100644 --- a/nginx.spec +++ b/nginx.spec @@ -10,8 +10,8 @@ Name: nginx Epoch: 1 -Version: 1.2.6 -Release: 6%{?dist} +Version: 1.2.7 +Release: 1%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -21,11 +21,12 @@ License: BSD URL: http://nginx.org/ Source0: http://nginx.org/download/nginx-%{version}.tar.gz -Source1: nginx.service -Source2: nginx.logrotate -Source3: nginx.conf -Source4: nginx-upgrade -Source5: nginx-upgrade.8 +Source1: http://nginx.org/download/nginx-%{version}.tar.gz.asc +Source10: nginx.service +Source11: nginx.logrotate +Source12: nginx.conf +Source13: nginx-upgrade +Source14: nginx-upgrade.8 Source100: index.html Source101: poweredby.png Source102: nginx-logo.png @@ -122,9 +123,9 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f '{}' \; find %{buildroot} -type f -empty -exec rm -f '{}' \; find %{buildroot} -type f -iname '*.so' -exec chmod 0755 '{}' \; -install -p -D -m 0644 %{SOURCE1} \ +install -p -D -m 0644 %{SOURCE10} \ %{buildroot}%{_unitdir}/nginx.service -install -p -D -m 0644 %{SOURCE2} \ +install -p -D -m 0644 %{SOURCE11} \ %{buildroot}%{_sysconfdir}/logrotate.d/nginx install -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d @@ -132,7 +133,7 @@ install -p -d -m 0755 %{buildroot}%{nginx_home_tmp} install -p -d -m 0755 %{buildroot}%{nginx_logdir} install -p -d -m 0755 %{buildroot}%{nginx_webroot} -install -p -m 0644 %{SOURCE3} \ +install -p -m 0644 %{SOURCE12} \ %{buildroot}%{nginx_confdir} install -p -m 0644 %{SOURCE100} \ %{buildroot}%{nginx_webroot} @@ -144,8 +145,8 @@ install -p -m 0644 %{SOURCE103} %{SOURCE104} \ install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \ %{buildroot}%{_mandir}/man8/nginx.8 -install -p -D -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/nginx-upgrade -install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man8/nginx-upgrade.8 +install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade +install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8 %pre @@ -202,6 +203,10 @@ fi %changelog +* Sat Feb 16 2013 Jamie Nguyen - 1:1.2.7-1 +- update to upstream release 1.2.7 +- add .asc file + * Tue Feb 05 2013 Jamie Nguyen - 1:1.2.6-6 - use 'kill' instead of 'systemctl' when rotating log files to workaround SELinux issue (#889151) diff --git a/sources b/sources index 5b33a33..ed0f63e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1350d26eb9b66364d9143fb3c4366ab6 nginx-1.2.6.tar.gz +d252f5c689a14a668e241c744ccf5f06 nginx-1.2.7.tar.gz +ad82b6bc2d437995b9cc474d97441c9d nginx-1.2.7.tar.gz.asc