Merge branch 'master' into f19

2014-02-16 18:02:14 +00:00 · 2014-02-16 18:02:14 +00:00 · 1f05349f9e
commit 1f05349f9e
parent fd256c6cd1 b55cfc23dd
3 changed files with 8 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -26,3 +26,5 @@ x86_64/
 /nginx-1.4.3.tar.gz.asc
 /nginx-1.4.4.tar.gz
 /nginx-1.4.4.tar.gz.asc
+/nginx-1.4.5.tar.gz
+/nginx-1.4.5.tar.gz.asc
--- a/nginx.spec
+++ b/nginx.spec
@ -15,7 +15,7 @@

 Name:              nginx
 Epoch:             1
-Version:           1.4.4
+Version:           1.4.5
 Release:           1%{?dist}

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


 %changelog
+* Sun Feb 16 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.5-1
+- update to upstream release 1.4.5
+
 * Wed Nov 20 2013 Peter Borsa <peter.borsa@gmail.com> - 1:1.4.4-1
 - Update to upstream release 1.4.4
 - Security fix BZ 1032267
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-5dfaba1cbeae9087f3949860a02caa9f  nginx-1.4.4.tar.gz
-2ee31d592b724762cc53a1ee4b041c99  nginx-1.4.4.tar.gz.asc
+1a635e9543570f0c881b8ec9db0c6898  nginx-1.4.5.tar.gz
+fc84e1d6320384b507d70c3d706acac2  nginx-1.4.5.tar.gz.asc