From 13cf02b3fc114d92565966888cca94b64b059868 Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <jamie@tomoyolinux.co.uk>
Date: May 16 2012 21:57:26 +0000
Subject: Update to upstream release 1.2.0


---

diff --git a/.gitignore b/.gitignore
index 4e3bf3c..14b56d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ x86_64/
 *.rpm
 /nginx-1.0.14.tar.gz
 /nginx-1.0.15.tar.gz
+/nginx-1.2.0.tar.gz
diff --git a/nginx.spec b/nginx.spec
index e2d808a..773e032 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -10,8 +10,8 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.0.15
-Release:           4%{?dist}
+Version:           1.2.0
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -219,6 +219,9 @@ fi
 
 
 %changelog
+* Wed May 16 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1:1.2.0-1
+- update to upstream release 1.2.0
+
 * Wed May 16 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1:1.0.15-4
 - add nginx-upgrade to replace functionality from the nginx initscript
   that was lost after migration to systemd
diff --git a/sources b/sources
index b884ce0..03ec847 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17da4802209b83d9bebb0f0edd975dfc  nginx-1.0.15.tar.gz
+a02ef93d65a7031a1ea3256ad5eba626  nginx-1.2.0.tar.gz