Author: pluto                        Date: Tue Aug 26 21:51:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix gcj and cpp build.

---- Files affected:
SPECS:
   antlr.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/antlr.spec
diff -u SPECS/antlr.spec:1.53 SPECS/antlr.spec:1.54
--- SPECS/antlr.spec:1.53       Sat Jan 12 21:47:25 2008
+++ SPECS/antlr.spec    Tue Aug 26 23:51:23 2008
@@ -20,6 +20,7 @@
 Source0:       http://www.antlr.org/download/%{name}-%{version}.tar.gz
 # Source0-md5: 01cc9a2a454dd33dcd8c856ec89af090
 Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-strcasecmp.patch
 URL:           http://www.antlr.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -29,9 +30,7 @@
 BuildRequires: sed >= 4.0
 %if %{with java}
 %if %{with gcj}
-BuildRequires: gcc-java >= 5:4.0.0
-BuildRequires: jar
-Requires:      /usr/bin/gij
+BuildRequires: java-gcj-compat-devel
 %else
 BuildRequires: jar
 BuildRequires: jdk
@@ -99,6 +98,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.sub scripts
@@ -107,9 +107,8 @@
        %{?with_dotnet:CSHARPC=/usr/bin/mcs --enable-csharp} \
        %{!?with_dotnet:--disable-csharp} \
        --enable-cxx \
-       %{!?with_gcj:CLASSPATH=`pwd` --with-java=java --with-javac=javac 
--with-jar=jar} \
+       %{?with_java:CLASSPATH=`pwd` --with-java=java --with-javac=javac 
--with-jar=jar} \
        %{!?with_java:--disable-java} \
-       %{?with_gcj:--with-java=gij --with-javac=gcj --with-jar=jar}
 
 CXXFLAGS="%{rpmcxxflags}" \
 %{__make}
@@ -175,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2008/08/26 21:51:23  pluto
+- fix gcj and cpp build.
+
 Revision 1.53  2008/01/12 20:47:25  qboosh
 - release 4: rebuild with current g++
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/antlr.spec?r1=1.53&r2=1.54&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to