rpms/antlr/devel antlr.spec,1.34,1.35

[Deepak Bhole (dbhole)]

Author: dbhole

Update of /cvs/extras/rpms/antlr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352

Modified Files:
	antlr.spec 
Log Message:

- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC




Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- antlr.spec	29 Aug 2007 18:44:19 -0000	1.34
+++ antlr.spec	24 Sep 2007 21:12:47 -0000	1.35
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.5%{?dist}
+Release:        1jpp.6%{?dist}
 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,9 @@
 
 
 %changelog
+* Mon Sep 24 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.6
+- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.7.7-1jpp.5
 - Rebuild for selinux ppc32 issue.