Author: pluto Date: Mon Jul 28 13:02:03 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - simplify gcc macros. - fix javac wrapper (now it runs ecj wich accepts arguments in sunish way).
---- Files affected: SPECS: java-gcj-compat.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/java-gcj-compat.spec diff -u SPECS/java-gcj-compat.spec:1.14 SPECS/java-gcj-compat.spec:1.15 --- SPECS/java-gcj-compat.spec:1.14 Mon Jul 28 14:40:09 2008 +++ SPECS/java-gcj-compat.spec Mon Jul 28 15:01:58 2008 @@ -12,22 +12,21 @@ 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} +Patch0: %{name}-javac.patch +# gcc >= 6:4.3.1-3 is required for working ecj1. +%define _gcc_ver 6:4.3.1-3 +BuildRequires: gcc-java >= %{_gcc_ver} BuildRequires: rpmbuild(macros) >= 1.153 Obsoletes: java-sun-jre Obsoletes: java-sun-jre-jdbc Obsoletes: jdkgcj Provides: jre -Requires: libgcj >= 5:%{_gcc_ver}-%{_gcc_rel} +Requires: libgcj >= %{_gcc_ver} 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}/%{_libgcj_ver}/include +%define _gccinc %{_libdir}/gcc/%{_target_platform}/%(%{__cc} -dumpversion)/include %description A collection of wrapper scripts, symlinks and jar files. It is meant @@ -43,10 +42,10 @@ Summary(pl.UTF-8): Skrypty powłoki i dowiązania do symulacji środowiska programistycznego Javy przy użyciu GCJ Group: Development/Languages/Java Provides: jdk -Requires: gcc-java >= 5:%{_gcc_ver}-%{_gcc_rel} +Requires: gcc-java >= %{_gcc_ver} Requires: gjdoc Requires: java-gcj-compat -Requires: libgcj-devel >= 5:%{_gcc_ver}-%{_gcc_rel} +Requires: libgcj-devel >= %{_gcc_ver} Obsoletes: java-sun Obsoletes: java-sun-tools @@ -74,18 +73,12 @@ %prep %setup -q - -%build -cat <<EOF >javac.in -#!/bin/sh -export CLASSPATH=\$CLASSPATH\${CLASSPATH:+:}%{_javadir}/libgcj.jar -exec %{_bindir}/gcj \$@ -EOF - +%patch0 -p1 %{__sed} -i 's/sinjdoc/gjdoc/g' Makefile.* %{__sed} -i 's/fastjar/gjar/g' Makefile.* %{__sed} -i 's/ecj/gcj/g' Makefile.* +%build %configure \ --with-arch-directory=%{_target_base_arch} \ @@ -103,6 +96,11 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +cat <<EOF >$RPM_BUILD_ROOT%{_jvmdir}/bin/javac +#!/bin/sh +exec %{_bindir}/gij -jar %{_javadir}/ecj.jar \$@ +EOF + for f in jaas jdbc-stdext jce jndi jndi-cos jndi-ldap jndi-ldap jndi-rmi jta rt; do ln -sf %{_javadir}/libgcj.jar $RPM_BUILD_ROOT%{_jvmdir}/jre/lib/$f.jar cp -d $RPM_BUILD_ROOT{%{_jvmdir}/jre/lib/$f.jar,%{_javadir}} @@ -174,6 +172,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2008/07/28 13:01:58 pluto +- simplify gcc macros. +- fix javac wrapper (now it runs ecj wich accepts arguments in sunish way). + Revision 1.14 2008/07/28 12:40:09 arekm - package symlinks ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-gcj-compat.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
