SPECS: hsqldb.spec - AC-branch merge

[glen]

Author: glen                         Date: Sat Mar  3 15:19:30 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   hsqldb.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/hsqldb.spec
diff -u SPECS/hsqldb.spec:1.13 SPECS/hsqldb.spec:1.14
--- SPECS/hsqldb.spec:1.13	Thu Mar  1 23:15:33 2007
+++ SPECS/hsqldb.spec	Sat Mar  3 16:19:25 2007
@@ -24,12 +24,15 @@
 URL:		http://www.hsqldb.org/
 BuildRequires:	ant
 BuildRequires:	jdk
-%{!?with_binary:BuildRequires:	jdk < 1.6}
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	junit
 BuildRequires:	rpmbuild(macros) >= 1.300
+%if %{without binary}
+BuildRequires:	jdk < 1.6
+BuildRequires:	junit
 BuildRequires:	servletapi4
+%endif
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -124,7 +127,9 @@
 cp -a index.html manual
 
 %build
-export CLASSPATH=$(build-classpath \
+export CLASSPATH=\
+%if %{without binary}
+$(build-classpath \
 	jsse/jsse \
 	jsse/jnet \
 	jsse/jcert \
@@ -132,6 +137,8 @@
 	servletapi4 \
 	junit \
 )
+%endif
+
 cd build
 %ant %{!?with_binary:jar} javadoc
 
@@ -242,6 +249,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/03/03 15:19:25  glen
+- AC-branch merge
+
 Revision 1.13  2007/03/01 22:15:33  glen
 - initscript integration for -server
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hsqldb.spec?r1=1.13&r2=1.14&f=u