rpms/ncarg/devel ncarg-4.4.1-ppc64.patch,1.1,1.2

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Thu May 24 05:43:36 UTC 2007


Author: orion

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

Modified Files:
	ncarg-4.4.1-ppc64.patch 
Log Message:
No tty in mock builds


ncarg-4.4.1-ppc64.patch:

Index: ncarg-4.4.1-ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/ncarg-4.4.1-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncarg-4.4.1-ppc64.patch	24 May 2007 05:33:13 -0000	1.1
+++ ncarg-4.4.1-ppc64.patch	24 May 2007 05:43:01 -0000	1.2
@@ -1,6 +1,155 @@
 --- ncarg-4.4.1/config/ymake.ppc64	2005-02-07 10:51:57.000000000 -0700
-+++ ncarg-4.4.1/config/ymake	2007-05-23 23:30:44.000000000 -0600
-@@ -370,7 +370,7 @@
++++ ncarg-4.4.1/config/ymake	2007-05-23 23:42:34.000000000 -0600
+@@ -50,7 +50,7 @@
+                 if ($#argv) then
+                         set config_dir = "$argv[1]"
+                         if (! -d $config_dir) then
+-                                echo "$0 : Unable to open NCARG_CONFIG dir : $config_dir" > /dev/tty
++                                echo "$0 : Unable to open NCARG_CONFIG dir : $config_dir"
+                                 exit 1
+                         endif
+                                 
+@@ -85,7 +85,7 @@
+                 if ($#argv) then
+                         set top_dir = "$argv[1]"
+                         if (! -d $top_dir) then
+-                                echo "$0 : Unable to open Topdir : $top_dir" > /dev/tty
++                                echo "$0 : Unable to open Topdir : $top_dir"
+                                 exit 1
+                         endif
+ 
+@@ -126,7 +126,7 @@
+                 set defines = ($defines -D_YmakeArg5=$arg)
+                 breaksw
+         default:
+-                echo "$0 :Too Many args - ignoring $arg" > /dev/tty
++                echo "$0 :Too Many args - ignoring $arg"
+                 breaksw
+         endsw
+ end
+@@ -148,53 +148,53 @@
+ if ($useinstalled != 0) then
+         set config_dir = `ncargpath config`
+         if ($status != 0) then
+-                echo "$0 : Unable to find NCARG_CONFIG dir" > /dev/tty
++                echo "$0 : Unable to find NCARG_CONFIG dir"
+                 exit 1
+         endif
+         if (! -d $config_dir) then
+-                echo "$0 : Unable to open NCARG_CONFIG dir : $config_dir" > /dev/tty
++                echo "$0 : Unable to open NCARG_CONFIG dir : $config_dir"
+                 exit 1
+         endif
+         set defines = (-I$config_dir -DUseInstalled $defines)
+ 
+         set root_dir = `ncargpath root`
+         if ($status != 0) then
+-                echo "$0 : Unable to find NCARG_ROOT dir" > /dev/tty
++                echo "$0 : Unable to find NCARG_ROOT dir"
+                 exit 1
+         endif
+         set defines=($defines -D_InstRoot\=$root_dir -D_InstConfig\=$config_dir)
+ 
+         set tmp_dir = `ncargpath tmp`
+         if ($status != 0) then
+-                echo "$0 : Unable to find TMP dir" > /dev/tty
++                echo "$0 : Unable to find TMP dir"
+                 exit 1
+         endif
+         set defines = ($defines -D_InstTmp\=$tmp_dir)
+ 
+         set lib_dir = `ncargpath lib`
+         if ($status != 0) then
+-                echo "$0 : Unable to find NCARG_LIB dir" > /dev/tty
++                echo "$0 : Unable to find NCARG_LIB dir"
+                 exit 1
+         endif
+         set defines = ($defines -D_InstLib\=$lib_dir)
+ 
+         set bin_dir = `ncargpath bin`
+         if ($status != 0) then
+-                echo "$0 : Unable to find NCARG_BIN dir" > /dev/tty
++                echo "$0 : Unable to find NCARG_BIN dir"
+                 exit 1
+         endif
+         set defines = ($defines -D_InstBin\=$bin_dir)
+ 
+         set inc_dir = `ncargpath include`
+         if ($status != 0) then
+-                echo "$0 : Unable to find NCARG_INCLUDE dir" > /dev/tty
++                echo "$0 : Unable to find NCARG_INCLUDE dir"
+                 exit 1
+         endif
+         set defines = ($defines -D_InstInc\=$inc_dir)
+ 
+         set man_dir = `ncargpath man`
+         if ($status != 0) then
+-                echo "$0 : Unable to find NCARG_MAN dir" > /dev/tty
++                echo "$0 : Unable to find NCARG_MAN dir"
+                 exit 1
+         endif
+         set defines = ($defines -D_InstMan\=$man_dir)
+@@ -204,7 +204,7 @@
+         if (-r $YMAKE_DEV_FILE) then
+                 set defines=($defines -DYMAKEDEVFILE=\"$YMAKE_DEV_FILE\")
+         else
+-                echo "unable to open YMAKE_DEV_FILE $YMAKE_DEV_FILE" > /dev/tty
++                echo "unable to open YMAKE_DEV_FILE $YMAKE_DEV_FILE"
+         endif
+ endif
+ 
+@@ -227,7 +227,7 @@
+         set ymakefile="yMakefile"
+         set outfile = "Makefile"
+ else
+-        echo "$0 : no y(mM)akefile found" > /dev/tty
++        echo "$0 : no y(mM)akefile found"
+         exit 1
+ endif
+ 
+@@ -249,12 +249,12 @@
+ #       and the machine architecture. 
+ #
+ if ($status != 0) then
+-        echo "$0 : Unknown operating system" > /dev/tty
++        echo "$0 : Unknown operating system"
+         exit 1
+ endif
+ set mach = `uname -m`
+ if ($status != 0) then
+-        echo "$0 : Unknown machine type" > /dev/tty
++        echo "$0 : Unknown machine type"
+         exit 1
+ endif
+ 
+@@ -283,7 +283,7 @@
+                 set opsys = UNICOS
+                 breaksw
+         default:
+-                echo "$0 : system unknown" > /dev/tty
++                echo "$0 : system unknown"
+                 exit 1
+         endsw
+         breaksw
+@@ -330,7 +330,7 @@
+                 set sysincs = Sun3
+                 breaksw
+         default:
+-                echo "$0 : Unknown machine type" > /dev/tty
++                echo "$0 : Unknown machine type"
+                 exit 1
+         endsw
+ 
+@@ -347,7 +347,7 @@
+                 set arch = RS6k$model
+                 breaksw
+         default:
+-                echo "$0 : Unknown machine type" > /dev/tty
++                echo "$0 : Unknown machine type"
+                 exit 1
+         endsw
+ 
+@@ -370,14 +370,14 @@
              set sysincs = LINUX
              set vendor  = IBM
              breaksw
@@ -9,3 +158,101 @@
              set model   = $mach
              set arch    = $mach
              set sysincs = YDLINUX
+             set vendor  = APPLE
+             breaksw
+         default:
+-            echo "$0 : Unknown machine type" > /dev/tty
++            echo "$0 : Unknown machine type"
+             exit 1
+         endsw
+ 
+@@ -396,7 +396,7 @@
+             set vendor  = IBM
+             breaksw
+         default:
+-            echo "$0 : Unknown machine type" > /dev/tty
++            echo "$0 : Unknown machine type"
+             exit 1
+         endsw
+ 
+@@ -413,7 +413,7 @@
+             set vendor  = Apple
+             breaksw
+         default:
+-            echo "$0 : Unknown machine type" > /dev/tty
++            echo "$0 : Unknown machine type"
+             exit 1
+         endsw
+ 
+@@ -436,7 +436,7 @@
+                 set arch = $mach
+                 breaksw
+         default:
+-                echo "$0 : Unknown machine type" > /dev/tty
++                echo "$0 : Unknown machine type"
+                 exit 1
+         endsw
+ 
+@@ -473,7 +473,7 @@
+                 set arch = HP9k8$model
+                 breaksw
+         default:
+-                echo "$0 : Unknown machine type" > /dev/tty
++                echo "$0 : Unknown machine type"
+                 exit 1
+         endsw
+ 
+@@ -497,7 +497,7 @@
+                         set arch = $mach[1]
+                 breaksw
+                 default:
+-                        echo "$0 : Unknown machine type" > /dev/tty
++                        echo "$0 : Unknown machine type"
+                         exit 1
+                 endsw
+         breaksw
+@@ -511,7 +511,7 @@
+         breaksw
+ 
+         default:
+-                echo "$0 : Unknown machine type" > /dev/tty
++                echo "$0 : Unknown machine type"
+                 exit 1
+         endsw
+ 
+@@ -521,13 +521,13 @@
+         breaksw
+ 
+ default:
+-        echo "$0 : Unknown System Type - No Config file" > /dev/tty
++        echo "$0 : Unknown System Type - No Config file"
+         exit 1
+         breaksw
+ endsw
+ 
+ if ($?sysincs == 0) then
+-        echo "$0 : Unknown System Type - No Config file" > /dev/tty
++        echo "$0 : Unknown System Type - No Config file"
+         exit 1
+ endif
+ 
+@@ -538,7 +538,7 @@
+         set defines=($defines -DSystemIncludes=\"$sysincs\")
+         set defines=($defines -DSystemIncludesName=\"$sysincs\")
+ else
+-        echo "$0 : Unable to open Config file: $sysincs" > /dev/tty
++        echo "$0 : Unable to open Config file: $sysincs"
+         exit 1
+ endif
+ 
+@@ -670,8 +670,8 @@
+ exit 0
+ 
+ error_cleanup:
+-echo "" > /dev/tty
+-echo "Error in <ymake>: Interrupted in" `pwd` "- restoring $outfile" > /dev/tty
++echo ""
++echo "Error in <ymake>: Interrupted in" `pwd` "- restoring $outfile"
+ /bin/rm -f $outfile $tmp1
+ cp $outfile.bak $outfile
+ /bin/rm -f $outfile.bak




More information about the fedora-extras-commits mailing list