[trac/el6: 2/2] Merge branch 'master' into el6

[Jon Ciesla]

commit abbbaeaff879b5521fca7a6601c6b73586f905bc
Merge: c4a1447 3c7245b
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri May 4 08:59:04 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	trac.spec

 trac-0.12.3-pidfile.patch |   11 +++++++++++
 trac.spec                 |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --cc trac.spec
index e0e29db,95308c7..fce2e2d
--- a/trac.spec
+++ b/trac.spec
@@@ -37,7 -37,9 +38,8 @@@ development more streamlined and effect
  
  %prep
  %setup -q -n Trac-%{version}
- %patch0 -p1
 -
+ %patch0 -p0 -b .pidfile
+ 
  find contrib -type f -exec chmod -x '{}' \;
  # don't package windows specific files
  rm -f contrib/trac-post-commit-hook.cmd