rpms/antlr/devel antlr.spec,1.12,1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 28 21:18:53 UTC 2005
Author: vadimn
Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23216
Modified Files:
antlr.spec
Log Message:
reverted the previous change
Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- antlr.spec 10 Nov 2005 20:18:40 -0000 1.12
+++ antlr.spec 28 Nov 2005 21:18:50 -0000 1.13
@@ -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 @@
%if %{native}
BuildRequires: %{_bindir}/gcj, %{__make}
%else
+BuildArch: noarch
BuildRequires: ant
BuildRequires: %{__perl}, java-javadoc
Requires: jpackage-utils
@@ -93,12 +94,7 @@
%{__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 @@
# 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 @@
%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 @@
%changelog
+* Mon Nov 28 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:2.7.4-2jpp_4fc
+- Reverted the previous change.
+
* Mon Nov 7 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:2.7.4-2jpp_3fc
- BZ 172456: Added /usr/lib/libantlr.a and /usr/include/antlr/*.hpp
More information about the fedora-cvs-commits
mailing list