[munge/el6/master: 14/14] Merge branch 'master' into el6

[stevetraylen]

commit 868fec5bb42acc4aee0a2d53cd068aa783479857
Merge: b290c3c b7045f9
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Feb 27 11:12:27 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	munge.spec
    	sources

 .gitignore                       |    2 +-
 check-key-exists.patch           |   29 ++++++++++++++-----------
 initd-pass-rpmlint.patch         |   22 -------------------
 munge-correct-service-name.patch |   12 ----------
 munge.spec                       |   42 ++++++++++++++++++++++---------------
 remove-GPL_LICENSED-cpp.patch    |   21 -------------------
 sources                          |    2 +-
 7 files changed, 43 insertions(+), 87 deletions(-)
---
diff --cc .gitignore
index 896b46e,ae98466..bc3d1f2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- munge-0.5.8.tar.bz2
 -munge-0.5.9.tar.bz2
 -/munge-0.5.10.tar.bz2
++munge-0.5.10.tar.bz2
diff --cc munge.spec
index 20f4831,2d1eb09..4bd1f97
--- a/munge.spec
+++ b/munge.spec
@@@ -193,6 -190,20 +190,17 @@@ exit 
  
  
  %changelog
+ * Sun Feb 27 2011 Steve Traylen <steve.traylen at cern.ch> - 0.5.10-1
+ - Upstream to 0.5.10
+ - Add _isa tags to all build requires.
+ - Remove unused patch munge-correct-service-name.patch, upstream fixed.
+ - Update and add check-key-exists.patch back.
+ - Revert back to default CFLAGS. _GNU_SOURCE not needed any more.
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.9-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
+ * Tue Dec 7 2010 Steve Traylen <steve.traylen at cern.ch> - 0.5.9-4
+ - Upsteam is now hosted on google.
+ - Mark /var/run/munge as a %ghost file. #656631
+ 
  * Sat Mar 27 2010 Steve Traylen <steve.traylen at cern.ch> - 0.5.9-3
  - Release Bump
  * Fri Mar 26 2010 Steve Traylen <steve.traylen at cern.ch> - 0.5.9-2