Merge branch 'master' into f19

2014-03-18 21:15:38 +00:00 · 2014-03-18 21:15:38 +00:00 · 95d07b04c4
commit 95d07b04c4
parent 2ef2d094a7 6166551fc5
3 changed files with 8 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -30,3 +30,5 @@ x86_64/
 /nginx-1.4.5.tar.gz.asc
 /nginx-1.4.6.tar.gz
 /nginx-1.4.6.tar.gz.asc
+/nginx-1.4.7.tar.gz
+/nginx-1.4.7.tar.gz.asc
--- a/nginx.spec
+++ b/nginx.spec
@ -15,7 +15,7 @@

 Name:              nginx
 Epoch:             1
-Version:           1.4.6
+Version:           1.4.7
 Release:           1%{?dist}

 Summary:           A high performance web server and reverse proxy server
@ -268,6 +268,9 @@ fi


 %changelog
+* Tue Mar 18 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.7-1
+- update to upstream release 1.4.7
+
 * Wed Mar 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.6-1
 - update to upstream release 1.4.6

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-dee0fc2151cebde709c93ca20d8f239f  nginx-1.4.6.tar.gz
-96b4973689969aa4a59a1c6bf9a092e1  nginx-1.4.6.tar.gz.asc
+aee151d298dcbfeb88b3f7dd3e7a4d17  nginx-1.4.7.tar.gz
+88691c2ef0a17b90e0fca1d6f742c3b5  nginx-1.4.7.tar.gz.asc