Author: jajcus Date: Wed May 24 08:11:54 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - Release: 5 - another try with gcc-java
---- Files affected: SPECS: antlr.spec (1.23.2.6 -> 1.23.2.7) ---- Diffs: ================================================================ Index: SPECS/antlr.spec diff -u SPECS/antlr.spec:1.23.2.6 SPECS/antlr.spec:1.23.2.7 --- SPECS/antlr.spec:1.23.2.6 Mon May 22 22:45:22 2006 +++ SPECS/antlr.spec Wed May 24 10:11:49 2006 @@ -1,17 +1,16 @@ # $Revision$, $Date$ -%include /usr/lib/rpm/macros.java # TODO: # * Add a csharp bindings subpacakge (feel free to do it) # * Package the Emacs an Jedit modes # # Conditional build: -%bcond_with gcc_java # use gcj/gij instead of javac/java +%bcond_without gcc_java # use javac/java instead of gcj/gij (limits to architectures with Sun JDK) # Summary: ANother Tool for Language Recognition Summary(pl): Jeszcze jedno narzędzie do rozpoznawania języka Name: antlr Version: 2.7.5 -Release: 4 +Release: 5 License: Public Domain Group: Development/Tools Source0: http://www.antlr.org/download/%{name}-%{version}.tar.gz @@ -21,6 +20,7 @@ BuildRequires: automake BuildRequires: libstdc++-devel BuildRequires: python +BuildRequires: rpmbuild(macros) >= 1.300 %if %{with gcc_java} BuildRequires: gcc-java BuildRequires: jar @@ -74,16 +74,21 @@ %build unset CLASSPATH || : -unset JAVA_HOME || : -%{?with_javac:export JAVA_HOME=%{java_home}} +%if %{with gcc_java} +unset JAVA_HOME || : +%else +JAVA_HOME=%{java_home} +%endif cp -f /usr/share/automake/config.sub scripts %configure \ %{?!with_gcc_java:CLASSPATH=`pwd` --with-javac=javac} \ - %{?without_gcc_java:--with-javac=gcj} \ - %{?without_gcc_java:--with-java=gij} \ + %{?with_gcc_java:--with-javac=gcj} \ + %{?without_gcc_java:--with-javac=javac} \ + %{?with_gcc_java:--with-java=gij} \ + %{?without_gcc_java:--with-java=java} \ --disable-csharp %{__make} @@ -134,6 +139,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23.2.7 2006/05/24 08:11:49 jajcus +- Release: 5 +- another try with gcc-java + Revision 1.23.2.6 2006/05/22 20:45:22 qboosh - formatting, pl for python- from HEAD; added missing defattr ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/antlr.spec?r1=1.23.2.6&r2=1.23.2.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
