diff --git a/axis.changes b/axis.changes index fc555fe..65cbb32 100644 --- a/axis.changes +++ b/axis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 09:01:44 UTC 2011 - mvyskocil@suse.cz + +- build using openjdk, use ant.build.javac.target and source 1.4 + to prevent javadoc fail, clean up BuildRequires + ------------------------------------------------------------------- Thu May 21 15:01:43 CEST 2009 - mvyskocil@suse.cz diff --git a/axis.spec b/axis.spec index 3a5e8fc..2abe42b 100644 --- a/axis.spec +++ b/axis.spec @@ -18,15 +18,13 @@ # norootforbuild # icecream 0 - -Name: axis -BuildRequires: ant ant-jdepend ant-nodeps antlr classpath classpathx-mail gnu-jaf jakarta-commons-discovery jakarta-commons-httpclient3 jakarta-commons-logging jpackage-utils junit libtool log4j-mini perl servletapi5 unzip update-alternatives wsdl4j xerces-j2 -BuildRequires: java-1_5_0-gcj-compat-devel %define name axis %define version 1.4 %define archivever 1_4 %define release 2jpp %define section free + +Name: axis Version: 1.4 Release: 265 Summary: Apache implementation of the SOAP @@ -38,6 +36,23 @@ Patch0: unimplemented-dom3-methods.patch Patch1: axis-1.4-gcc44_build.patch # Mandatory requires # optional requires +BuildRequires: ant +BuildRequires: ant-jdepend +BuildRequires: antlr +BuildRequires: classpath +BuildRequires: classpathx-mail +BuildRequires: gnu-jaf +BuildRequires: jakarta-commons-discovery +BuildRequires: jakarta-commons-httpclient3 +BuildRequires: jakarta-commons-logging +BuildRequires: jpackage-utils +BuildRequires: junit +BuildRequires: log4j-mini +BuildRequires: servletapi5 +BuildRequires: unzip +BuildRequires: wsdl4j +BuildRequires: xerces-j2 +BuildRequires: java-devel Requires: java Requires: jpackage-utils >= 1.5 Requires: jaf @@ -55,42 +70,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Apache Axis is an implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. - - -Authors: --------- - Andras Avar - David Chappell - Glen Daniels - Doug Davis - Eric Friedman - Chris Haddad - Tom Jordahl - Dominik Kacprzak - Rick Kellogg - Toshiyuki Kimura (Toshi) - Steve Loughran - Jaime Meritt - Yuhichi Nakamura - Thomas Sandholm - Igor Sedukhin - Davanum Srinivas - Sanjiva Weerawarana - Changshin Lee (a.k.a. Ias) - Srinath Perera - Venkat Reddy - Jarek Gawor - Jongjin Choi - Guillaume Sauthier - Chaminda Divitotawela - Nuwan Gurusinghe - Susantha Kumara - Damitha Kumarage - Nadika Ranasinghe - Sanjaya Sinharage - Roshan Weerasuriya - Sanjiva Weerawarana - %package javadoc License: The Apache Software License PreReq: coreutils @@ -100,42 +79,6 @@ Group: Documentation/Other %description javadoc Api documentation for axis - - -Authors: --------- - Andras Avar - David Chappell - Glen Daniels - Doug Davis - Eric Friedman - Chris Haddad - Tom Jordahl - Dominik Kacprzak - Rick Kellogg - Toshiyuki Kimura (Toshi) - Steve Loughran - Jaime Meritt - Yuhichi Nakamura - Thomas Sandholm - Igor Sedukhin - Davanum Srinivas - Sanjiva Weerawarana - Changshin Lee (a.k.a. Ias) - Srinath Perera - Venkat Reddy - Jarek Gawor - Jongjin Choi - Guillaume Sauthier - Chaminda Divitotawela - Nuwan Gurusinghe - Susantha Kumara - Damitha Kumarage - Nadika Ranasinghe - Sanjaya Sinharage - Roshan Weerasuriya - Sanjiva Weerawarana - %package manual License: The Apache Software License Summary: Manual for axis @@ -144,55 +87,16 @@ Group: Documentation/Other %description manual Manual for axis - - -Authors: --------- - Andras Avar - David Chappell - Glen Daniels - Doug Davis - Eric Friedman - Chris Haddad - Tom Jordahl - Dominik Kacprzak - Rick Kellogg - Toshiyuki Kimura (Toshi) - Steve Loughran - Jaime Meritt - Yuhichi Nakamura - Thomas Sandholm - Igor Sedukhin - Davanum Srinivas - Sanjiva Weerawarana - Changshin Lee (a.k.a. Ias) - Srinath Perera - Venkat Reddy - Jarek Gawor - Jongjin Choi - Guillaume Sauthier - Chaminda Divitotawela - Nuwan Gurusinghe - Susantha Kumara - Damitha Kumarage - Nadika Ranasinghe - Sanjaya Sinharage - Roshan Weerasuriya - Sanjiva Weerawarana - %prep %setup -q -n %{name}-%{archivever} %patch0 -p1 -%if %suse_version >= 1120 %patch1 -p1 -b gcc44-build -%endif # Remove provided binaries find . -name "*.jar" -exec rm -f {} \; find . -name "*.zip" -exec rm -f {} \; find . -name "*.class" -exec rm -f {} \; %build -export GC_MAXIMUM_HEAP_SIZE="134217728" #128M [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient3 jakarta-commons-logging log4j activation javamail servletapi5) export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null) @@ -212,18 +116,18 @@ ant -Dcompile.ime=true \ -Djunit.jar=$(build-classpath junit 2>/dev/null) \ -Djimi.jar=$(build-classpath jimi 2>/dev/null) \ -Djsse.jar=$(build-classpath jsse/jsse 2>/dev/null) \ - -Dsource=1.4 \ - -Dtarget=1.4 \ + -Dant.build.javac.source=1.4 \ + -Dant.build.javac.target=1.4 \ clean compile javadocs %install ### Jar files -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 %{buildroot}%{_javadir}/%{name} pushd build/lib install -m 644 axis.jar axis-ant.jar saaj.jar jaxrpc.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name} + %{buildroot}%{_javadir}/%{name} popd -pushd $RPM_BUILD_ROOT%{_javadir}/%{name} +pushd %{buildroot}%{_javadir}/%{name} for jar in *.jar ; do vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g) mv $jar $vjar @@ -231,24 +135,11 @@ pushd $RPM_BUILD_ROOT%{_javadir}/%{name} done popd ### Javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -pushd docs - rm -fr apiDocs - ln -fs %{_javadocdir}/%{name} apiDocs -popd +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} %clean -rm -rf $RPM_BUILD_ROOT - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi +rm -rf %{buildroot} %files %defattr(0644,root,root,0755) @@ -258,8 +149,8 @@ fi %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%dir %{_javadocdir}/%{name} +%{_javadocdir}/%{name}/* %files manual %defattr(0644,root,root,0755)