rpms/ncarg/devel ncarg-4.4.2-ppc64.patch, NONE, 1.1 Site.local, 1.4, 1.5 ncarg.spec, 1.15, 1.16

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/ncarg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8542

Modified Files:
	Site.local ncarg.spec 
Added Files:
	ncarg-4.4.2-ppc64.patch 
Log Message:
Another crack at ppc64
Move more config changes to config/LINUX from Site.local


ncarg-4.4.2-ppc64.patch:

--- NEW FILE ncarg-4.4.2-ppc64.patch ---
--- ncarg-4.4.2/config/ymake.ppc64	2006-05-02 08:16:20.000000000 -0600
+++ ncarg-4.4.2/config/ymake	2007-06-27 10:28:13.000000000 -0600
@@ -364,19 +364,13 @@
         case    x*86:
         case    i*64:
         case    x*64:
-        case    p*64:
+        case    ppc*:
         case    alpha:
             set model   = $mach
             set arch    = $mach
             set sysincs = LINUX
             set vendor  = IBM
             breaksw
-        case    ppc:
-            set model   = $mach
-            set arch    = $mach
-            set sysincs = YDLINUX
-            set vendor  = APPLE
-            breaksw
         default:
             echo "$0 : Unknown machine type" > /dev/tty
             exit 1


Index: Site.local
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/Site.local,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Site.local	27 Jun 2007 15:35:27 -0000	1.4
+++ Site.local	27 Jun 2007 16:35:31 -0000	1.5
@@ -2,8 +2,6 @@
 #define ManRoot $(RPM_BUILD_ROOT)/usr/share/man
 #define LibRoot $(RPM_BUILD_ROOT)/usr/@LIB@/ncarg
 
-#define CcOptions $(RPM_OPT_FLAGS)
-#define FcOptions $(RPM_OPT_FLAGS)
 #define BuildWithF90 TRUE
 #define FCompiler gfortran
 #define CtoFLibraries -lgfortran -lm


Index: ncarg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/ncarg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ncarg.spec	27 Jun 2007 15:35:27 -0000	1.15
+++ ncarg.spec	27 Jun 2007 16:35:31 -0000	1.16
@@ -11,7 +11,7 @@
 Source3:        ncarg.sh
 Patch3:         ncarg-4.4.1-rpmroot.patch
 Patch4:         ncarg-4.4.1-deps.patch
-Patch5:         ncarg-4.4.1-ppc64.patch
+Patch5:         ncarg-4.4.2-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel
@@ -38,8 +38,14 @@
 #Fix up the lib install dir
 cp %{SOURCE2} %{SOURCE3} .
 sed -i -e s, at LIB@,%{_lib},g config/Site.local ncarg.csh ncarg.sh
+#Use ppc config if needed
+%ifarch ppc pcc64
+cp config/LINUX.ppc32.GNU config/LINUX
+%endif
 #Remove -DSYSV from StdDefines
-sed -i -e /StdDefines/s/-DSYSV// config/LINUX.*
+sed -i -e /StdDefines/s/-DSYSV// config/LINUX
+#Add RPM_OPT_FLAGS
+sed -i -e '/cOptions/s/$/ $(RPM_OPT_FLAGS)/' config/LINUX
 
 
 %build