[tog-pegasus: 5/5] Merge branch 'f15'

[Dennis Gilmore]

commit c93db885efd509562a442cf77efa5ccd154ea892
Merge: 0d9db52 728b0b6
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Mar 30 17:54:01 2011 -0500

    Merge branch 'f15'
    
    Conflicts:
    	tog-pegasus.spec

 pegasus-2.10.0-sparc-posix-lock.patch |   20 ++++++++++++++++++++
 tog-pegasus.spec                      |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --cc tog-pegasus.spec
index 2103c93,b4b1648..a5e4b54
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@@ -8,7 -8,7 +8,7 @@@
  
  Name:           tog-pegasus
  Version:        %{major_ver}.0
--Release:        4%{?dist}
++Release:        5%{?dist}
  Epoch:          2
  Summary:        OpenPegasus WBEM Services for Linux
  
@@@ -60,8 -60,8 +60,10 @@@ Patch15:        pegasus-2.9.0-openssl.p
  Patch16:        pegasus-2.9.1-getpagesize.patch
  # 18: Let the makefile install initscript we want to use
  Patch18:        pegasus-2.9.1-makefile-initscript.patch
 -# 19: use posix locks on sparc arches
 -Patch19:        pegasus-2.10.0-sparc-posix-lock.patch
 +# 19: Don't strip binaries
 +Patch19:        pegasus-2.10.0-dont-strip.patch
++# 20: use posix locks on sparc arches
++Patch20:        pegasus-2.10.0-sparc-posix-lock.patch
  
  BuildRequires:  bash, sed, grep, coreutils, procps, gcc, gcc-c++
  BuildRequires:  libstdc++, make, pam-devel
@@@ -186,7 -186,7 +188,8 @@@ The OpenPegasus WBEM tests for the Open
  %patch0 -p1 -b .initscript
  %patch16 -p1 -b .getpagesize
  %patch18 -p1 -b .makefile-initscript
 -%patch19 -p1 -b .sparc-locks
 +%patch19 -p1 -b .dont-strip
++%patch20 -p1 -b .sparc-locks
  
  
  %build
@@@ -414,7 -414,10 +417,10 @@@ f
  
  
  %changelog
 -* Wed Mar 30 2011 Dennis Gilmore <dennis at ausil.us> - 2:2.10.1-4
++* Wed Mar 30 2011 Dennis Gilmore <dennis at ausil.us> - 2:2.10.1-5
+ - use posix locks on sparc linux arches
+ 
 -* Tue Mar 22 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.10.1-3
 +* Tue Mar 22 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.10.1-4
  - Use %%ghost for /var/run/tog-pegasus
    Resolves: #656705