rpms/antlr/devel antlr.spec,1.11,1.12
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Nov 10 20:18:44 UTC 2005
- Previous message (by thread): rpms/kernel/devel patch-2.6.14-git13.bz2.sign, NONE, 1.1 .cvsignore, 1.270, 1.271 kernel-2.6.spec, 1.1657, 1.1658 linux-2.6-build-nonintconfig.patch, 1.1, 1.2 sources, 1.212, 1.213 upstream, 1.197, 1.198 linux-2.6-ide-floppy-eject.patch, 1.1, NONE patch-2.6.14-git11.bz2.sign, 1.1, NONE patch-2.6.14-git12.bz2.sign, 1.1, NONE patch-2.6.14-git9.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/pm-utils/devel pm-utils.spec, 1.8, 1.9 sources, 1.10, 1.11 .cvsignore, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: vadimn
Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22482
Modified Files:
antlr.spec
Log Message:
BZ 172456: Added /usr/lib/libantlr.a and /usr/include/antlr/*.hpp
Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- antlr.spec 21 Jun 2005 12:33:53 -0000 1.11
+++ antlr.spec 10 Nov 2005 20:18:40 -0000 1.12
@@ -5,7 +5,7 @@
Summary: ANother Tool for Language Recognition
Name: antlr
Version: 2.7.4
-Release: 2jpp_2fc
+Release: 2jpp_3fc
Epoch: 0
License: Public Domain
URL: http://www.antlr.org/
@@ -20,7 +20,6 @@
%if %{native}
BuildRequires: %{_bindir}/gcj, %{__make}
%else
-BuildArch: noarch
BuildRequires: ant
BuildRequires: %{__perl}, java-javadoc
Requires: jpackage-utils
@@ -94,7 +93,12 @@
%{__make} -f %{SOURCE3} COMPOPTS="$RPM_OPT_FLAGS"
%else
-ant -Dj2se.apidoc=%{_javadocdir}/java
+ 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
%endif
@@ -117,6 +121,13 @@
# 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}
@@ -175,6 +186,8 @@
%defattr(0755,root,root,0755)
%ghost %{_bindir}/antlr
%{_bindir}/antlr-java
+%{headers}/*.hpp
+%{_libdir}/libantlr.a
%files manual
%defattr(0644,root,root,0755)
@@ -194,6 +207,9 @@
%changelog
+* 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
+
* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:2.7.4-2jpp_2fc
- Remove jarfile from the tarball.
- Remove now-unnecessary workaround for #144775.
- Previous message (by thread): rpms/kernel/devel patch-2.6.14-git13.bz2.sign, NONE, 1.1 .cvsignore, 1.270, 1.271 kernel-2.6.spec, 1.1657, 1.1658 linux-2.6-build-nonintconfig.patch, 1.1, 1.2 sources, 1.212, 1.213 upstream, 1.197, 1.198 linux-2.6-ide-floppy-eject.patch, 1.1, NONE patch-2.6.14-git11.bz2.sign, 1.1, NONE patch-2.6.14-git12.bz2.sign, 1.1, NONE patch-2.6.14-git9.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/pm-utils/devel pm-utils.spec, 1.8, 1.9 sources, 1.10, 1.11 .cvsignore, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list