[axis] Conditionalize xmlbeans/xml-security for RHEL.

[Alexander Kurtakov]

commit a221d2a951c7cd10189dca0896e8bcc37a2bbfdc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Apr 30 20:27:25 2012 +0300

    Conditionalize xmlbeans/xml-security for RHEL.

 axis.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/axis.spec b/axis.spec
index ed49303..62b2fc9 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,6 +1,6 @@
 Name:          axis
 Version:       1.4
-Release:       11%{?dist}
+Release:       12%{?dist}
 Epoch:         0
 Summary:       SOAP implementation in Java
 License:       ASL 2.0
@@ -50,8 +50,10 @@ 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
@@ -66,7 +68,6 @@ Requires:      log4j
 Requires:      wsdl4j
 
 BuildArch:     noarch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
@@ -128,8 +129,10 @@ 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) .
@@ -154,16 +157,16 @@ 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
 
 #    -Djimi.jar=$(build-classpath jimi) \
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 ### Jar files
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -196,7 +199,6 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
 %add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE README release-notes.html changelog.html
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/*.jar
@@ -205,14 +207,15 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %files manual
-%defattr(-,root,root,-)
 %doc docs/*
 
 %changelog
+* Mon Apr 30 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-12
+- Conditionalize xmlbeans/xml-security for RHEL.
+
 * Mon Feb 13 2012 Andy Grimm <agrimm at gmail.com> - 0:1.4-11
 - Add POM files from maven.org
 - Uncomment optional BuildRequires to enable axis-schema build