diff --git a/axis.spec b/axis.spec index a3905cd..c42c396 100644 --- a/axis.spec +++ b/axis.spec @@ -1,6 +1,6 @@ Name: axis Version: 1.4 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 0 Summary: SOAP implementation in Java License: ASL 2.0 @@ -44,7 +44,7 @@ BuildRequires: xmlunit BuildRequires: bea-stax-api BuildRequires: bsf BuildRequires: castor -BuildRequires: javamail +BuildRequires: javax.mail BuildRequires: tomcat-servlet-3.0-api BuildRequires: apache-commons-discovery BuildRequires: jakarta-commons-httpclient >= 1:3.0 @@ -53,7 +53,7 @@ BuildRequires: apache-commons-net BuildRequires: jakarta-oro BuildRequires: regexp BuildRequires: log4j -BuildRequires: wsdl4j +BuildRequires: javax.wsdl BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -62,19 +62,20 @@ BuildRequires: xml-security BuildRequires: zip # optional requires #BuildRequires: jimi -BuildRequires: jetty Requires: java Requires: jpackage-utils >= 0:1.6 Requires: apache-commons-discovery Requires: apache-commons-logging Requires: jakarta-commons-httpclient >= 1:3.0 -Requires: javamail Requires: log4j -Requires: wsdl4j +Requires: javax.mail +Requires: javax.wsdl BuildArch: noarch +Provides: javax.xml.rpc + %description Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. @@ -92,14 +93,12 @@ This project is a follow-on to the Apache SOAP project. %package javadoc Summary: Javadoc for %{name} -Group: Documentation %description javadoc Javadoc for %{name}. %package manual Summary: Manual for %{name} -Group: Documentation %description manual Documentation for %{name}. @@ -135,7 +134,6 @@ ln -sf $(build-classpath commons-httpclient) . ln -sf $(build-classpath commons-logging) . ln -sf $(build-classpath commons-net) . ln -sf $(build-classpath httpunit) . -ln -sf $(build-classpath jetty/jetty) . ln -sf $(build-classpath log4j) . ln -sf $(build-classpath oro) . ln -sf $(build-classpath xalan-j2) . @@ -164,7 +162,6 @@ ant \ -Dbsf.jar=$(build-classpath bsf) \ -Dcastor.jar=$(build-classpath castor) \ -Dcommons-net.jar=$(build-classpath commons-net) \ - -Djetty.jar=$(build-classpath jetty/jetty) \ -Dsecurity.jar=$(build-classpath xml-security) \ -Dxmlbeans.jar=$(build-classpath xmlbeans) \ -Dhttpunit.jar=$(build-classpath httpunit) \ @@ -211,13 +208,20 @@ install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom 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 -a "axis:axis-schema" -%files +# J2EE API dir +install -d -m 755 %{buildroot}%{_javadir}/javax.xml.rpc/ +ln -sf ../%{name}/jaxrpc.jar %{buildroot}%{_javadir}/javax.xml.rpc/ +ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.xml.rpc/ +build-jar-repository %{buildroot}%{_javadir}/javax.xml.rpc/ javax.wsdl \ + javax.mail apache-commons-logging apache-commons-discovery \ + jakarta-commons-httpclient log4j + + +%files -f .mfiles %doc LICENSE README release-notes.html changelog.html %dir %{_javadir}/%{name} -%{_javadir}/%{name}/*.jar +%{_javadir}/javax.xml.rpc %{_datadir}/%{name}-%{version} -%{_mavenpomdir}/*.pom -%{_mavendepmapfragdir}/%{name} %files javadoc %{_javadocdir}/%{name} @@ -226,6 +230,9 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom %doc docs/* %changelog +* Tue Aug 13 2013 Stanislav Ochotnicky - 0:1.4-23 +- Add javax.xml.rpc provides and directory + * Wed Aug 07 2013 Mat Booth - 0:1.4-22 - Update BR/R and patch to build against newer APIs, rhbz #992008