SPECS: axis.spec - dropped build.properties. It does not work or I am too s...

[pawelz]

Author: pawelz                       Date: Sun Mar  1 23:25:52 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped build.properties. It does not work or I am too stupid to use ant.
- build with jars bundled with axis distribution. At least it builds now.

---- Files affected:
SPECS:
   axis.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/axis.spec
diff -u SPECS/axis.spec:1.17 SPECS/axis.spec:1.18
--- SPECS/axis.spec:1.17	Sat Feb 28 16:36:02 2009
+++ SPECS/axis.spec	Mon Mar  2 00:25:46 2009
@@ -15,7 +15,6 @@
 Group:		Development/Languages/Java
 Source0:	http://ws.apache.org/axis/dist/%{archivever}/%{name}-src-%{archivever}.tar.gz
 # Source0-md5:	3dcce3cbd37f52d70ebeb858f90608dc
-Source1:	axis-build.properties
 Patch0:		axis-classpath.patch
 Patch1:		axis-missing_xsd.patch
 URL:		http://ws.apache.org/axis/
@@ -23,31 +22,30 @@
 BuildRequires:	ant-nodeps
 BuildRequires:	java-gcj-compat-devel
 # Mandatory requires
-BuildRequires:	jaf
-BuildRequires:	java-commons-discovery
-BuildRequires:	java-commons-httpclient
-BuildRequires:	java-commons-logging
-BuildRequires:	java-xmlbeans
-BuildRequires:	javamail
-BuildRequires:	jaxp_parser_impl
-BuildRequires:	jpackage-utils
-BuildRequires:	logging-log4j
-BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	servletapi5
-BuildRequires:	wsdl4j
-# optional requires
-BuildRequires:	castor
-BuildRequires:	httpunit
-BuildRequires:	jakarta-oro
-# BuildRequires:	jimi
-# BuildRequires:	jms
-BuildRequires:	jsse
-BuildRequires:	junit
+# BuildRequires:	jaf
+# BuildRequires:	java-commons-discovery
+# BuildRequires:	java-commons-httpclient
+# BuildRequires:	java-commons-logging
+# BuildRequires:	java-xmlbeans
+# BuildRequires:	javamail
+# BuildRequires:	jaxp_parser_impl
+# BuildRequires:	jpackage-utils
+# BuildRequires:	logging-log4j
+# BuildRequires:	rpmbuild(macros) >= 1.300
+# BuildRequires:	servletapi5
+# BuildRequires:	wsdl4j
+# # optional requires
+# BuildRequires:	castor
+# BuildRequires:	httpunit
+# BuildRequires:	jakarta-oro
+# # BuildRequires:	jimi
+# # BuildRequires:	jms
+# BuildRequires:	jsse
+# BuildRequires:	junit
 Requires:	jaf
 Requires:	jakarta-commons-discovery
 Requires:	jakarta-commons-httpclient
 Requires:	jakarta-commons-logging
-Requires:	java
 Requires:	javamail
 Requires:	jaxp_parser_impl
 Requires:	logging-log4j
@@ -115,25 +113,27 @@
 %setup -q -n %{name}-%{archivever}
 
 # Remove provided binaries
-find -name '*.jar' | xargs rm -v
+# find -name '*.jar' | xargs rm -v
 find -name '*.class' | xargs rm -v
 
 %patch0 -p1
 %patch1 -p1
 
-cp %SOURCE1 build.properties
-
 %build
-export JAVA_HOME=%{java_home}
+
+# requiredJars="activation bsf castor commons-codec commons-discovery commons-httpclient commons-logging httpunit jsse junit log4j mail xmlbeans servlet wsdl4j"
+# for I in $requiredJars; do
+#   ln -sf $(find-jar $I) lib/$I
+# done
 
 CLASSPATH=$(build-classpath ecj tools)
 export CLASSPATH
-%ant dist
+%ant -Dbuild.compiler=modern dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 ### Jar files
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
 
 cd build/lib
 install axis.jar axis-ant.jar saaj.jar jaxrpc.jar \
@@ -180,6 +180,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/03/01 23:25:46  pawelz
+- dropped build.properties. It does not work or I am too stupid to use ant.
+- build with jars bundled with axis distribution. At least it builds now.
+
 Revision 1.17  2009/02/28 15:36:02  pawelz
 - decrease rel to 0.1
 - something is wrong with build.properties
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/axis.spec?r1=1.17&r2=1.18&f=u