- Upgrade to 2.7.7

- Resolve 172456 with patches from Vadim Nasardinov and Radu Greab

.cvsignore

@@ -1 +1 @@
-antlr-2.7.6-RHCLEAN.tar.gz
+antlr-2.7.7-RHCLEAN.tar.gz

antlr.spec

@@ -38,8 +38,8 @@
 
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
-Version:        2.7.6
+Version:        2.7.7
-Release:        4jpp.2
+Release:        1jpp.1
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -60,6 +60,8 @@ BuildRequires:  %{_bindir}/gcj, %{__make}
 BuildArch:      noarch
 %endif
 BuildRequires:  ant
+BuildRequires:  mono-core
+BuildRequires:  mono-winforms
 BuildRequires:  %{__perl}, java-javadoc
 Requires:       jpackage-utils
 Requires(post): %{_sbindir}/update-alternatives
@@ -146,6 +148,12 @@ cp -p %{SOURCE1} build.xml
 
 %else
 ant -Dj2se.apidoc=%{_javadocdir}/java
+cp work/lib/antlr.jar .  # make expects to find it here
+export CLASSPATH=.
+%configure --without-examples
+make
+find . -type f > /tmp/antlr.filelist
+rm antlr.jar             # no longer needed
 %endif
 
 
@@ -168,6 +176,14 @@ cp -p work/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 # script
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/antlr-java
 
+# C++ lib and headers, antlr-config
+%define headers %{_includedir}/%{name}
+
+mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
+install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
+install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
+install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
+
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -259,8 +275,11 @@ fi
 %defattr(0644,root,root,0755)
 %doc INSTALL.txt LICENSE.txt
 %{_javadir}/%{name}*.jar
+%{headers}/*.hpp
+%{_libdir}/libantlr.a
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
+%{_bindir}/antlr-config
 %{_bindir}/antlr-java
 
 %if %{gcj_support}
@@ -285,6 +304,10 @@ fi
 
 
 %changelog
+* Fri Jan 19 2007 Deepak Bhole <dbhole@redhat.com> 0:2.7.7-1jpp.1
+- Upgrade to 2.7.7
+- Resolve 172456 with patches from Vadim Nasardinov and Radu Greab
+
 * Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> = 0:2.7.6-4jpp.2
 - Add missing postun for javadoc.
 

sources

@@ -1 +1 @@
-a8d17be897f0d15dc96061f01aee2d12  antlr-2.7.6-RHCLEAN.tar.gz
+d8052d9409b5f3e9c8e1c41648ae13d1  antlr-2.7.7-RHCLEAN.tar.gz