rpms/pvm/FC-4 pvm.spec,1.26,1.27

Wed Jun 1 21:23:38 UTC 2005

Author: jvdias

Update of /cvs/dist/rpms/pvm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13960

Modified Files:
	pvm.spec 
Log Message:
fix bugs 158303, 155785



Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/FC-4/pvm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27

--- pvm.spec	1 Jun 2005 18:10:26 -0000	1.26
+++ pvm.spec	1 Jun 2005 21:23:36 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Libraries for distributed computing.
 Name: pvm 
 Version: 3.4.5
-Release: 4_FC4
+Release: 5_FC4
 License: freely distributable
 Group: Development/Libraries
 Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
@@ -64,6 +64,14 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+
+# Patch the LINUX*64.def files to look in lib64 dirs as well for libraries.
+perl -p -i -e "s|ARCHDLIB[	\ ]*=|ARCHDLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX64.def
+perl -p -i -e "s|ARCHLIB[	\ ]*=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX64.def
+%ifarch x86_64
+echo 'ARCHCFLAGS += -fPIC' >> conf/LINUX64.def
+%endif
+
 cp conf/LINUX.def conf/LINUXS390.def
 cp conf/LINUX.m4 conf/LINUXS390.m4
 cp conf/LINUX.def conf/LINUXI386.def
@@ -77,16 +85,6 @@
 cp conf/LINUX64.def conf/LINUXPPC64.def
 cp conf/LINUX64.m4 conf/LINUXPPC64.m4
 
-# Patch the LINUXX86_64.def file to look in lib64 dirs as well for libraries.
-for I in X86_64 PPC64 S390X; do
-perl -p -i -e "s|ARCHDLIB	=|ARCHDLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX$I.def
-perl -p -i -e "s|ARCHLIB	=|ARCHLIB	= -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX$I.def
-done
-
-%ifarch x86_64
-echo 'ARCHCFLAGS += -fPIC' >> conf/LINUXX86_64.def
-echo 'ARCHCFLAGS += -fPIC' >> conf/LINUX64.def
-%endif
 
 #%define pvm_arch %(echo %{_os}%{_target_cpu} | tr 'a-z' 'A-Z')
 %build


