SPECS: freecol.spec - ...however resulting rpm is noarch, so resto...

[glen]

Author: glen                         Date: Wed Nov 21 22:14:23 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ...however resulting rpm is noarch, so restored
- java deps/cosmetics from template-java.spec

---- Files affected:
SPECS:
   freecol.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/freecol.spec
diff -u SPECS/freecol.spec:1.15 SPECS/freecol.spec:1.16
--- SPECS/freecol.spec:1.15	Wed Nov 21 22:25:35 2007
+++ SPECS/freecol.spec	Wed Nov 21 23:14:18 2007
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
-# NOTE:
-# - BuildArch is not noarch beacouse required higlayout excludes some archs
+%include	/usr/lib/rpm/macros.java
 Summary:	Open source Colonization clone
 Summary(pl.UTF-8):	Klon gry Colonization o otwartych źródłach
 Name:		freecol
@@ -16,10 +15,15 @@
 BuildRequires:	ant-nodeps
 BuildRequires:	higlayout
 BuildRequires:	jdk >= 1.4
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	higlayout
 Requires:	jre >= 1.4
 Requires:	jre-X11
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
+BuildArch:	noarch
+# list arches that can fill higlayout dependency
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,9 +38,8 @@
 %setup -q -n %{name}
 
 %build
-CLASSPATH="$(build-classpath higlayout)"
-JAVA_HOME=%{java_home}
-export CLASSPATH JAVA_HOME
+required_jars="higlayout"
+export CLASSPATH=$(build-classpath $required_jars)
 %ant
 
 %install
@@ -68,6 +71,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007-11-21 22:14:18  glen
+- ...however resulting rpm is noarch, so restored
+- java deps/cosmetics from template-java.spec
+
 Revision 1.15  2007-11-21 21:25:35  arvenil
 - ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664}
   (same EA as in higlayout)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freecol.spec?r1=1.15&r2=1.16&f=u