[axis/f17] Revert RHEL conditionals - we are not getting complete build with them.

[Alexander Kurtakov]

commit 6a69ff7421fa35153cb96172bb7ba5ef030cf15f
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Apr 30 21:06:53 2012 +0300

    Revert RHEL conditionals - we are not getting complete build with them.

 axis.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/axis.spec b/axis.spec
index 62b2fc9..584a321 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,6 +1,6 @@
 Name:          axis
 Version:       1.4
-Release:       12%{?dist}
+Release:       13%{?dist}
 Epoch:         0
 Summary:       SOAP implementation in Java
 License:       ASL 2.0
@@ -50,10 +50,8 @@ BuildRequires: wsdl4j
 BuildRequires: xalan-j2
 BuildRequires: xerces-j2
 BuildRequires: xml-commons-apis12
-%if 0%{?rhel} <= 0
 BuildRequires: xmlbeans
 BuildRequires: xml-security
-%endif
 # optional requires
 #BuildRequires: jimi
 BuildRequires: jetty
@@ -129,10 +127,8 @@ ln -sf $(build-classpath jetty/jetty) .
 ln -sf $(build-classpath log4j) .
 ln -sf $(build-classpath oro) .
 ln -sf $(build-classpath xalan-j2) .
-%if 0%{?rhel} <= 0
 ln -sf $(build-classpath xml-security) .
 ln -sf $(build-classpath xmlbeans/xbean) .
-%endif
 ln -sf $(build-classpath wsdl4j) .
 pushd endorsed
 ln -sf $(build-classpath xerces-j2) .
@@ -157,10 +153,8 @@ ant \
     -Dcastor.jar=$(build-classpath castor) \
     -Dcommons-net.jar=$(build-classpath commons-net) \
     -Djetty.jar=$(build-classpath jetty/jetty) \
-%if 0%{?rhel} <= 0
     -Dsecurity.jar=$(build-classpath xml-security) \
     -Dxmlbeans.jar=$(build-classpath xmlbeans) \
-%endif
     -Dhttpunit.jar=$(build-classpath httpunit) \
     clean war javadocs # junit
 
@@ -213,6 +207,9 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
 %doc docs/*
 
 %changelog
+* Mon Apr 30 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-13
+- Revert RHEL conditionals - we are not getting complete build with them.
+
 * Mon Apr 30 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-12
 - Conditionalize xmlbeans/xml-security for RHEL.