SPECS: jacl.spec - Version: 1.3.2 - use jpackage and current jdk l...

[jajcus]

Author: jajcus                       Date: Sun May 21 15:56:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Version: 1.3.2
- use jpackage and current jdk location
- jdk is needed even when building with jikes

---- Files affected:
SPECS:
   jacl.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/jacl.spec
diff -u SPECS/jacl.spec:1.4 SPECS/jacl.spec:1.5
--- SPECS/jacl.spec:1.4	Sun Oct 30 18:10:39 2005
+++ SPECS/jacl.spec	Sun May 21 17:56:11 2006
@@ -1,23 +1,25 @@
 # $Revision$, $Date$
+%include /usr/lib/rpm/macros.java
 # TODO: resolve tcljava.jar conflict with tclBlend
 #
 # Conditional build:
-%bcond_with	javac	# use javac instead of jikes
+%bcond_with    javac   # use javac instead of jikes
 #
 Summary:	Java Application Command Language
 Summary(pl):	Java Application Command Language - język poleceń dla aplikacji
 Name:		jacl
-Version:	1.2.6
-Release:	0.2
+Version:	1.3.2
+Release:	1
 License:	BSD
 Group:		Development/Languages/Java
-Source0:	ftp://ftp.tcl.tk/pub/tcl/java/%{name}%{version}.tar.gz
-# Source0-md5:	0a3b4c5a5df6e6320c4a59fb3f5fb050
-URL:		http://www.tcl.tk/software/java/
-%{?with_javac:BuildRequires:	jdk}
-%{!?with_javac:BuildRequires:	jikes}
+Source0:	http://dl.sourceforge.net/tcljava/%{name}%{version}.tar.gz
+# Source0-md5:	44ec6149e1664d4fc13651e9288dd2b6
+URL:		http://tcljava.sourceforge.net/
+%{!?with_javac:BuildRequires:  jikes}
+BuildRequires:	jdk
 BuildRequires:	sed >= 4.0
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,25 +53,25 @@
 skryptowy.
 
 %prep
-%setup -q -c -T -n %{name}%{version}
-# uhm
-gzip -dc %{SOURCE0} | tar xzf - -C ..
+%setup -q -n %{name}%{version}
 
 %build
-JAVA_HOME="%{_libdir}/java"
-export JAVA_HOME
-cd unix
+unset CLASSPATH || :
+unset JAVA_HOME || :
+export JAVA_HOME="%{java_home}" 
 %configure2_13 \
-	%{?with_javac:--without-jikes}
+       %{?with_javac:--without-jikes} \
+	--with-jdk="%{java_home}"
 %{__make} \
-	%{?with_javac:JAVAC_FLAGS="-g -source 1.4"}
+       %{?with_javac:JAVAC_FLAGS="-g -source 1.4"}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C unix install \
+%{__make} install \
 	BIN_INSTALL_DIR=$RPM_BUILD_ROOT%{_bindir} \
-	XP_LIB_INSTALL_DIR=$RPM_BUILD_ROOT%{_javadir}
+	XP_LIB_INSTALL_DIR=$RPM_BUILD_ROOT%{_javadir} \
+	XP_TCLJAVA_INSTALL_DIR=$RPM_BUILD_ROOT%{_javadir}
 
 sed -i -e 's,^XP_LIB_INSTALL_DIR=.*,XP_LIB_INSTALL_DIR="%{_javadir}",' \
 	$RPM_BUILD_ROOT%{_bindir}/jaclsh
@@ -91,6 +93,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/05/21 15:56:11  jajcus
+- Version: 1.3.2
+- use jpackage and current jdk location
+- jdk is needed even when building with jikes
+
 Revision 1.4  2005/10/30 17:10:39  adamg
 - set JAVA_HOME (configure fails without this)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jacl.spec?r1=1.4&r2=1.5&f=u