Author: dbhole
Update of /cvs/extras/rpms/antlr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9317
Modified Files:
antlr.spec
Log Message:
- Sync with copy from F8 (only bug fixes):
- Applied patch to fix conditionals (from skasal at redhat dot com)
- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/F-7/antlr.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- antlr.spec 12 Jun 2007 20:06:30 -0000 1.32
+++ antlr.spec 24 Sep 2007 21:20:26 -0000 1.33
@@ -31,15 +31,15 @@
%define _with_gcj_support 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define build_jedit %{?_with_jedit:1}%{!?_without_jedit:0}
+%define build_jedit %{?_with_jedit:1}%{!?_with_jedit:0}
%define section free
-%define native %{?_with_native:1}%{!?_without_native:0}
+%define native %{?_with_native:1}%{!?_with_native:0}
Summary: ANother Tool for Language Recognition
Name: antlr
Version: 2.7.7
-Release: 1jpp.3%{?dist}.1
+Release: 1jpp.3%{?dist}.2
Epoch: 0
License: Public Domain
URL: http://www.antlr.org/
@@ -155,23 +155,7 @@
cp work/lib/antlr.jar . # make expects to find it here
export CLASSPATH=.
%configure --without-examples
-make
-
-pushd lib/cpp/src/
- mkdir temp_holder_for_nonpic
- mv libantlr.a temp_holder_for_nonpic/
- make clean
-
- # Compile with PIC
- make CXXFLAGS="${CXXFLAGS} -fPIC"
-
- # Move files out
- mv libantlr.a libantlr-pic.a
- mv temp_holder_for_nonpic/libantlr.a .
-
- # Cleanup temp dir
- rmdir temp_holder_for_nonpic
-popd
+make CXXFLAGS="${CXXFLAGS} -fPIC"
find . -type f > /tmp/antlr.filelist
rm antlr.jar # no longer needed
@@ -203,7 +187,6 @@
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 644 lib/cpp/src/libantlr-pic.a $RPM_BUILD_ROOT%{_libdir}
install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
# javadoc
@@ -299,7 +282,6 @@
%{_javadir}/%{name}*.jar
%{headers}
%{_libdir}/libantlr.a
-%{_libdir}/libantlr-pic.a
%defattr(0755,root,root,0755)
%ghost %{_bindir}/antlr
%{_bindir}/antlr-config
@@ -327,6 +309,11 @@
%changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.2
+- Sync with copy from F8 (only bug fixes):
+ - Applied patch to fix conditionals (from skasal at redhat dot com)
+ - Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
+
* Tue Jun 12 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.1
- Added a PIC compiled archive (bz# 242305)