From bb16e4a5567202fd40dd7de6cad60b28b976955e Mon Sep 17 00:00:00 2001
From: vadimn <vadimn@fedoraproject.org>
Date: Mon, 28 Nov 2005 21:18:50 +0000
Subject: [PATCH] reverted the previous change

---
 antlr.spec | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/antlr.spec b/antlr.spec
index 86179fe..0cbf91e 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -5,7 +5,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.4
-Release:        2jpp_3fc
+Release:        2jpp_4fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -20,6 +20,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %if %{native}
 BuildRequires:  %{_bindir}/gcj, %{__make}
 %else
+BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  %{__perl}, java-javadoc
 Requires:       jpackage-utils
@@ -93,12 +94,7 @@ cp -p %{SOURCE1} build.xml
 %{__make} -f %{SOURCE3} COMPOPTS="$RPM_OPT_FLAGS"
 
 %else
-  ant -Dj2se.apidoc=%{_javadocdir}/java
-  cp work/lib/antlr.jar .  # make expects to find it here
-  export CLASSPATH=.       # make wants to see the ./configure script on the classpath
-  %configure --disable-examples
-  make
-  rm antlr.jar             # no longer needed
+ant -Dj2se.apidoc=%{_javadocdir}/java
 %endif
 
 
@@ -121,13 +117,6 @@ 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
-%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}
-
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -186,8 +175,6 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-java
-%{headers}/*.hpp
-%{_libdir}/libantlr.a
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -207,6 +194,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Nov 28 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:2.7.4-2jpp_4fc
+- Reverted the previous change.
+
 * Mon Nov  7 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:2.7.4-2jpp_3fc
 - BZ 172456: Added /usr/lib/libantlr.a and /usr/include/antlr/*.hpp