SPECS: java-gcj-compat.spec - using gjdoc, gjar and gcj - strict requires t...

[blekot]

Author: blekot                       Date: Mon Jul 28 10:38:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- using gjdoc, gjar and gcj
- strict requires to libgcj-devel version

---- Files affected:
SPECS:
   java-gcj-compat.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/java-gcj-compat.spec
diff -u SPECS/java-gcj-compat.spec:1.12 SPECS/java-gcj-compat.spec:1.13
--- SPECS/java-gcj-compat.spec:1.12	Mon Jul 28 09:50:01 2008
+++ SPECS/java-gcj-compat.spec	Mon Jul 28 12:38:47 2008
@@ -7,25 +7,27 @@
 Summary(pl.UTF-8):	Skrypty powłoki i dowiązania do symulacji środowiska uruchomieniowego Javy przy użyciu GCJ
 Name:		java-gcj-compat
 Version:	1.0.78
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	ftp://sources.redhat.com/pub/rhug/%{name}-%{version}.tar.gz
 # Source0-md5:	03d8e7e4a52608878600cd16f5c8454a
 %define		_gcc_ver	4.0.0
+%define		_libgcj_ver	%(rpm -q libgcj-devel --queryformat "%{VERSION}" 2> /dev/null || exit 1)
 %define		_gcc_rel	3
+
 BuildRequires:	gcc-java >= 5:%{_gcc_ver}-%{_gcc_rel}
 BuildRequires:	rpmbuild(macros) >= 1.153
-Requires:	libgcj >= 5:%{_gcc_ver}-%{_gcc_rel}
-Provides:	jre
 Obsoletes:	java-sun-jre
 Obsoletes:	java-sun-jre-jdbc
 Obsoletes:	jdkgcj
+Provides:	jre
+Requires:	libgcj >= 5:%{_gcc_ver}-%{_gcc_rel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_jvmroot	%{_libdir}/java
 %define		_jvmdir		%{_jvmroot}/java-1.5.0-gcj-1.5.0.0
-%define		_gccinc		%{_libdir}/gcc/%{_target_platform}/%{_gcc_ver}/include
+%define		_gccinc		%{_libdir}/gcc/%{_target_platform}/%{_libgcj_ver}/include
 
 %description
 A collection of wrapper scripts, symlinks and jar files. It is meant
@@ -40,11 +42,11 @@
 Summary:	Shell scripts and symbolic links to simulate Java development environment with GCJ
 Summary(pl.UTF-8):	Skrypty powłoki i dowiązania do symulacji środowiska programistycznego Javy przy użyciu GCJ
 Group:		Development/Languages/Java
-Requires:	ecj
+Provides:	jdk
 Requires:	gcc-java >= 5:%{_gcc_ver}-%{_gcc_rel}
 Requires:	gjdoc
 Requires:	java-gcj-compat
-Provides:	jdk
+Requires:	libgcj-devel >= 5:%{_gcc_ver}-%{_gcc_rel}
 Obsoletes:	java-sun
 Obsoletes:	java-sun-tools
 
@@ -77,9 +79,14 @@
 cat <<EOF >javac.in
 #!/bin/sh
 export CLASSPATH=\$CLASSPATH\${CLASSPATH:+:}%{_javadir}/libgcj.jar
-exec %{_bindir}/ecj \$@
+exec %{_bindir}/gcj \$@
 EOF
 
+%{__sed} -i 's/sinjdoc/gjdoc/g' Makefile.*
+%{__sed} -i 's/fastjar/gjar/g' Makefile.*
+%{__sed} -i 's/ecj/gcj/g' Makefile.*
+
+
 %configure \
 	--disable-symlinks \
 	--with-arch-directory=%{_target_base_arch} \
@@ -158,6 +165,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008/07/28 10:38:47  blekot
+- using gjdoc, gjar and gcj
+- strict requires to libgcj-devel version
+
 Revision 1.12  2008/07/28 07:50:01  blekot
 - starting with 1.0.78
 - added python package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-gcj-compat.spec?r1=1.12&r2=1.13&f=u