SPECS: tclBlend.spec - updated to 1.4.0, removed obsolete build pa...

[qboosh]

Author: qboosh                       Date: Thu Aug 24 18:56:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.4.0, removed obsolete build patch; jikes/kaffe support dropped upstream

---- Files affected:
SPECS:
   tclBlend.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/tclBlend.spec
diff -u SPECS/tclBlend.spec:1.1 SPECS/tclBlend.spec:1.2
--- SPECS/tclBlend.spec:1.1	Sun May  8 13:42:52 2005
+++ SPECS/tclBlend.spec	Thu Aug 24 20:56:43 2006
@@ -1,26 +1,24 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	javac	# use javac instead of jikes+kaffe
-#
 Summary:	Tcl Blend - Java access for Tcl system
 Summary(pl):	Tcl Blend - dostęp do Javy w systemie Tcl
 Name:		tclBlend
-Version:	1.2.6
+Version:	1.4.0
 Release:	0.1
 License:	BSD
 Group:		Development/Languages/Tcl
-Source0:	ftp://ftp.tcl.tk/pub/tcl/java/%{name}%{version}.tar.gz
-# Source0-md5:	96ba50d8c9af7c37caae60b1b77c9650
-Patch0:		%{name}-build.patch
+Source0:	http://dl.sourceforge.net/tcljava/%{name}%{version}.tar.gz
+# Source0-md5:	c88f84fb6a72af4c951648295f0e02f0
 URL:		http://www.tcl.tk/software/java/
-BuildRequires:	autoconf
-%{?with_javac:BuildRequires:	jdk}
-%{!?with_javac:BuildRequires:	jikes}
-%{!?with_javac:BuildRequires:	kaffe-devel}
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	jdk >= 1.4
+BuildRequires:	jpackage-utils
+BuildRequires:	sed >= 4.0
 BuildRequires:	tcl-devel >= 8.0
+BuildRequires:	tcl-thread
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		specflags	-fno-strict-aliasing
+
 %description
 Tcl Blend provides two new capabilities to the Tcl system. First, Tcl
 Blend provides Java classes that expose key pieces of the interfaces
@@ -46,26 +44,30 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p1
+
+sed -i -e 's,TCLSH_LOC=\$TCL_BIN_DIR/tclsh,TCLSH_LOC=/usr/bin/tclsh,' tcljava.m4
 
 %build
-cd unix
+unset CLASSPATH || :
 %{__autoconf}
 %configure \
-	%{?with_javac:--without-jikes} \
-	--with-tcl=/usr/lib
-%{__make} \
-	%{?with_javac:JAVAC_FLAGS="-g -source 1.4"}
+	--with-jdk="%{java_home}" \
+	--with-tcl=/usr/lib \
+	--with-thread=$(echo %{_libdir}/thread2.*)
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C unix install \
+%{__make} install \
 	TCLSH=/usr/bin/tclsh \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
 	BIN_INSTALL_DIR=$RPM_BUILD_ROOT%{_bindir} \
 	LIB_INSTALL_DIR=$RPM_BUILD_ROOT%{_libdir} \
 	XP_LIB_INSTALL_DIR=$RPM_BUILD_ROOT%{_javadir} \
-	TCLBLEND_LIBRARY=$RPM_BUILD_ROOT%{_prefix}/lib/tclblend
+	TCLBLEND_LIBRARY=$RPM_BUILD_ROOT%{_prefix}/lib/tclblend \
+	TCLJAVA_INSTALL_DIR=$RPM_BUILD_ROOT%{_libdir}/tcljava%{version} \
+	XP_TCLJAVA_INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix}/lib/tcljava%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,11 +77,17 @@
 %doc README changes.txt diffs.txt known_issues.txt license.*
 %attr(755,root,root) %{_bindir}/jtclsh
 %attr(755,root,root) %{_bindir}/jwish
-%attr(755,root,root) %{_libdir}/libtclblend.so
-%{_prefix}/lib/tclblend
-%{_javadir}/tclblend.jar
-# XXX: dup with jacl?
-%{_javadir}/tcljava.jar
+%dir %{_libdir}/tcljava%{version}
+%attr(755,root,root) %{_libdir}/tcljava%{version}/libtclblend.so
+%if "%{_libdir}" != "%{_prefix}/lib"
+%dir %{_prefix}/lib/tcljava%{version}
+%endif
+%{_prefix}/lib/tcljava%{version}/pkgIndex.tcl
+%{_prefix}/lib/tcljava%{version}/tclblend.jar
+%{_prefix}/lib/tcljava%{version}/tclblendsrc.jar
+%{_prefix}/lib/tcljava%{version}/tcljava.jar
+%{_prefix}/lib/tcljava%{version}/tcljavasrc.jar
+%{_prefix}/lib/xputils
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -87,6 +95,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/08/24 18:56:43  qboosh
+- updated to 1.4.0, removed obsolete build patch; jikes/kaffe support dropped upstream
+
 Revision 1.1  2005/05/08 11:42:52  qboosh
 - new (not tested with kaffe)
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tclBlend.spec?r1=1.1&r2=1.2&f=u