Merge branch 'f15'
Conflicts: tog-pegasus.spec
This commit is contained in:
commit
c93db885ef
20
pegasus-2.10.0-sparc-posix-lock.patch
Normal file
20
pegasus-2.10.0-sparc-posix-lock.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.orig 2011-03-30 15:59:54.000000000 -0500
|
||||||
|
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2011-03-30 16:00:52.000000000 -0500
|
||||||
|
@@ -90,4 +90,7 @@
|
||||||
|
# define PEGASUS_HAS_GETIFADDRS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+/* use POSIX read-write locks on this platform */
|
||||||
|
+#define PEGASUS_USE_POSIX_RWLOCK
|
||||||
|
+
|
||||||
|
#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */
|
||||||
|
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.orig 2011-03-30 15:59:30.000000000 -0500
|
||||||
|
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2011-03-30 16:01:05.000000000 -0500
|
||||||
|
@@ -90,4 +90,7 @@
|
||||||
|
# define PEGASUS_HAS_GETIFADDRS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+/* use POSIX read-write locks on this platform */
|
||||||
|
+#define PEGASUS_USE_POSIX_RWLOCK
|
||||||
|
+
|
||||||
|
#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Name: tog-pegasus
|
Name: tog-pegasus
|
||||||
Version: %{major_ver}.0
|
Version: %{major_ver}.0
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Summary: OpenPegasus WBEM Services for Linux
|
Summary: OpenPegasus WBEM Services for Linux
|
||||||
|
|
||||||
@ -62,6 +62,8 @@ Patch16: pegasus-2.9.1-getpagesize.patch
|
|||||||
Patch18: pegasus-2.9.1-makefile-initscript.patch
|
Patch18: pegasus-2.9.1-makefile-initscript.patch
|
||||||
# 19: Don't strip binaries
|
# 19: Don't strip binaries
|
||||||
Patch19: pegasus-2.10.0-dont-strip.patch
|
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: bash, sed, grep, coreutils, procps, gcc, gcc-c++
|
||||||
BuildRequires: libstdc++, make, pam-devel
|
BuildRequires: libstdc++, make, pam-devel
|
||||||
@ -187,6 +189,7 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
|
|||||||
%patch16 -p1 -b .getpagesize
|
%patch16 -p1 -b .getpagesize
|
||||||
%patch18 -p1 -b .makefile-initscript
|
%patch18 -p1 -b .makefile-initscript
|
||||||
%patch19 -p1 -b .dont-strip
|
%patch19 -p1 -b .dont-strip
|
||||||
|
%patch20 -p1 -b .sparc-locks
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -414,6 +417,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 30 2011 Dennis Gilmore <dennis@ausil.us> - 2:2.10.1-5
|
||||||
|
- use posix locks on sparc linux arches
|
||||||
|
|
||||||
* Tue Mar 22 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-4
|
* Tue Mar 22 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.10.1-4
|
||||||
- Use %%ghost for /var/run/tog-pegasus
|
- Use %%ghost for /var/run/tog-pegasus
|
||||||
Resolves: #656705
|
Resolves: #656705
|
||||||
|
Loading…
Reference in New Issue
Block a user