From 83f14e42cbd1a72fa7f44a9f5104b09cb95f77af Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <jamie@tomoyolinux.co.uk>
Date: Tue, 6 Mar 2012 08:30:34 +0000
Subject: [PATCH] Update to 1.0.13 and amend default pid/lock path

---
 .gitignore |  1 +
 nginx.spec | 12 ++++++++----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6676a0e..db83f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ x86_64/
 *swp
 *.rpm
 /nginx-1.0.12.tar.gz
+/nginx-1.0.13.tar.gz
diff --git a/nginx.spec b/nginx.spec
index eba8911..ab21b70 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -9,8 +9,8 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.0.12
-Release:           5%{?dist}
+Version:           1.0.13
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -84,8 +84,8 @@ export DESTDIR=%{buildroot}
     --http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
     --http-uwsgi-temp-path=%{nginx_home_tmp}/uwsgi \
     --http-scgi-temp-path=%{nginx_home_tmp}/scgi \
-    --pid-path=%{_localstatedir}/run/nginx.pid \
-    --lock-path=%{_localstatedir}/lock/subsys/nginx \
+    --pid-path=/run/nginx.pid \
+    --lock-path=/run/lock/subsys/nginx \
     --user=%{nginx_user} \
     --group=%{nginx_group} \
     --with-file-aio \
@@ -212,6 +212,10 @@ fi
 
 
 %changelog
+* Tue Mar 06 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> 1:1.0.13-1
+- update to upstream release 1.0.13
+- amend --pid-path and --log-path
+
 * Sun Mar 04 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> 1:1.0.12-5
 - change pid path in nginx.conf to match systemd service file
 
diff --git a/sources b/sources
index 4f149b1..3242b66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0ceefeb2a68ecb19e78ee894a5b52a3  nginx-1.0.12.tar.gz
+58360774e4875e8fc4c4286448cb54d0  nginx-1.0.13.tar.gz