SPECS: aspectwerkz.spec - satisfy deps, only dom4j left

[glen]

Author: glen                         Date: Sun Dec  2 18:58:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- satisfy deps, only dom4j left

---- Files affected:
SPECS:
   aspectwerkz.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/aspectwerkz.spec
diff -u SPECS/aspectwerkz.spec:1.9 SPECS/aspectwerkz.spec:1.10
--- SPECS/aspectwerkz.spec:1.9	Tue Nov 20 19:04:32 2007
+++ SPECS/aspectwerkz.spec	Sun Dec  2 19:58:28 2007
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	tests		# compile and run tests
+#
 %include	/usr/lib/rpm/macros.java
 Summary:	AOP for Java
 Summary(pl.UTF-8):	AOP dla Javy
@@ -14,20 +18,23 @@
 URL:		http://aspectwerkz.codehaus.org/
 BuildRequires:	ant >= 1.6
 BuildRequires:	asm
-#BuildRequires:	concurrent
+BuildRequires:	concurrent
 #BuildRequires:	dom4j
-#BuildRequires:	gnu.trove
-#BuildRequires:	jarjar
-#BuildRequires:	javassist
+BuildRequires:	gnu.trove
+BuildRequires:	jarjar
+BuildRequires:	javassist
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-#BuildRequires:	jrexx
+BuildRequires:	jrexx
 BuildRequires:	junit
-#BuildRequires:	junitperf
-#BuildRequires:	piccolo
-#BuildRequires:	qdox
+BuildRequires:	junitperf
+BuildRequires:	piccolo
+BuildRequires:	qdox
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires:	glibc-localedb-all
+%endif
 Requires:	concurrent
 Requires:	dom4j
 Requires:	gnu.trove
@@ -104,28 +111,25 @@
 
 %build
 export ASPECTWERKZ_HOME=$RPM_BUILD_DIR/%{name}-%{version}
-build-jar-repository -s -p lib \
-jarjar \
-asm \
-asm-attrs \
-asm-util \
-dom4j \
-gnu.trove \
-concurrent \
-junit \
-jrexx \
-javassist \
-qdox \
-piccolo \
-junitperf \
-
-ln -sf %{_prefix}/lib/jvm/java-1.4.2-bea/jre/lib/managementapi.jar lib
-ln -sf %{_prefix}/lib/jvm/java-1.4.2-bea/jre/lib/managementserver.jar lib
-
-export JAVA_HOME=%{_prefix}/lib/jvm/java-1.5.0
-%ant test cleandist
-#export JAVA_HOME=%{_prefix}/lib/jvm/java-1.5.0
-#ant test
+required_jars="
+jarjar
+asm
+asm-attrs
+asm-util
+dom4j
+gnu.trove
+concurrent
+junit
+jrexx
+javassist
+qdox
+piccolo
+junitperf
+"
+build-jar-repository -s -p lib "$required_jars" || :
+
+export LC_ALL=en_US # source code not US-ASCII
+%ant compile compile:extensions %{?with_tests:compile:test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -207,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-12-02 18:58:28  glen
+- satisfy deps, only dom4j left
+
 Revision 1.9  2007-11-20 18:04:32  glen
 - java deps; adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/aspectwerkz.spec?r1=1.9&r2=1.10&f=u