From 6b3bc3eb53b52090185a806269ed60c3f29593b6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 28 May 2012 16:06:33 +0100
Subject: [PATCH] Add options for ARM arch, cleanup ARCH directives, Add
 openssl base package

---
 tog-pegasus.spec | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/tog-pegasus.spec b/tog-pegasus.spec
index 7293ed6..37abe05 100644
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@ -8,7 +8,7 @@
 
 Name:           tog-pegasus
 Version:        %{major_ver}.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          2
 Summary:        OpenPegasus WBEM Services for Linux
 
@@ -65,7 +65,7 @@ Patch21:        pegasus-2.11.1-disable-privilege-separation.patch
 
 BuildRequires:  bash, sed, grep, coreutils, procps, gcc, gcc-c++
 BuildRequires:  libstdc++, make, pam-devel
-BuildRequires:  openssl-devel >= 0.9.6
+BuildRequires:  openssl, openssl-devel
 BuildRequires:  net-snmp-devel, openslp-devel
 BuildRequires:  systemd-units
 Requires:       net-snmp
@@ -114,36 +114,33 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
 
 %ifarch ia64
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU
-%else
+%endif
 %ifarch x86_64
 %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU
-%else
+%endif
 %ifarch ppc
 %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU
-%else
+%endif
 %ifarch ppc64
 %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC64_GNU
-%else
+%endif
 %ifarch s390
 %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU
-%else
+%endif
 %ifarch s390x
 %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
-%else
+%endif
 %ifarch sparcv9
 %global PEGASUS_HARDWARE_PLATFORM LINUX_SPARCV9_GNU
-%else
+%endif
 %ifarch sparc64
 %global PEGASUS_HARDWARE_PLATFORM LINUX_SPARC64_GNU
-%else
+%endif
+%ifarch %{ix86}
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif
-%endif
-%endif
-%endif
-%endif
-%endif
-%endif
+%ifarch %{arm}
+%global PEGASUS_HARDWARE_PLATFORM LINUX_XSCALE_GNU
 %endif
 
 %global PEGASUS_ARCH_LIB %{_lib}
@@ -221,7 +218,6 @@ make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release repository
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export PEGASUS_ROOT=%PEGASUS_RPM_ROOT
 export PEGASUS_HOME=%PEGASUS_RPM_HOME
 export PEGASUS_PLATFORM=%PEGASUS_HARDWARE_PLATFORM
@@ -261,10 +257,6 @@ ln -s libcmpiCppImpl.so.1 libcmpiCppImpl.so
 popd
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(0640, root, pegasus, 0750)
 %verify(not md5 size mtime mode group) /var/lib/Pegasus/repository
@@ -446,6 +438,10 @@ fi
 
 
 %changelog
+* Mon May 28 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 2:2.11.1-7
+- Add options for ARM arch, cleanup ARCH directives
+- Add openssl base package
+
 * Mon May 21 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.11.1-6
 - Add systemd support