rpms/ncarg/FC-6 ncarg-4.4.1-deps.patch, NONE, 1.1 ncarg-4.4.1-rpmroot.patch, NONE, 1.1 ncarg-4.4.1-config.patch, 1.1, 1.2 ncarg.spec, 1.9, 1.10

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/ncarg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1472

Modified Files:
	ncarg-4.4.1-config.patch ncarg.spec 
Added Files:
	ncarg-4.4.1-deps.patch ncarg-4.4.1-rpmroot.patch 
Log Message:
- Add patch to fix NCARG_ROOT in binaries.
- Add patch to fix dependency in fontcap.
- Tweak compile defines


ncarg-4.4.1-deps.patch:

--- NEW FILE ncarg-4.4.1-deps.patch ---
--- ncarg-4.4.1/common/src/fontcap/yMakefile.deps	2005-02-07 10:51:56.000000000 -0700
+++ ncarg-4.4.1/common/src/fontcap/yMakefile	2007-01-19 16:49:01.000000000 -0700
@@ -41,7 +41,7 @@
 # Rule for processing fontcaps
 .SUFFIXES: .fc
 
-.fc:
+.fc: $(FONTC)
 	@echo "	Processing fontcap $@"
 	@$(FONTC) $< $@
 

ncarg-4.4.1-rpmroot.patch:

--- NEW FILE ncarg-4.4.1-rpmroot.patch ---
--- ncarg-4.4.1/config/Project.rpmroot	2005-02-07 10:51:57.000000000 -0700
+++ ncarg-4.4.1/config/Project	2007-01-19 16:16:33.000000000 -0700
@@ -272,7 +272,7 @@
 		{"tmp","TMPDIR",NULL,"$(TMPROOT)",NULL,	\
 		"fontcap","FONTCAP",NULL,NULL,NULL,		\
 		"graphcap","GRAPHCAP",NULL,NULL,NULL,		\
-		"root",NULL,NULL,"$(ROOTPATH)",$(ROOTPATHCHECK),\
+		"root",NULL,NULL,"/usr",$(ROOTPATHCHECK),\
 		"usrresfile",NULL,NULL,$(USRRESFILE),NULL,	\
 		"gks_output",NULL,NULL,"gmeta",NULL,		\
 		"bin",NULL,"root",NULL,NULL,			\

ncarg-4.4.1-config.patch:

Index: ncarg-4.4.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/ncarg/FC-6/ncarg-4.4.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncarg-4.4.1-config.patch	3 Feb 2006 17:12:53 -0000	1.1
+++ ncarg-4.4.1-config.patch	22 Jan 2007 17:37:41 -0000	1.2
@@ -1,10 +1,19 @@
---- ncarg-4.4.1/config/LINUX.orig	2005-07-15 11:55:19.000000000 -0600
-+++ ncarg-4.4.1/config/LINUX	2005-07-15 11:55:32.000000000 -0600
-@@ -28,7 +28,6 @@
+--- ncarg-4.4.1/config/LINUX.config	2005-02-07 10:51:57.000000000 -0700
++++ ncarg-4.4.1/config/LINUX	2007-01-22 10:35:28.000000000 -0700
+@@ -22,15 +22,12 @@
+  *          system using the GNU compilers.
+  */
+ #define HdfDefines  -DLINUX
+-#define StdDefines  -DSYSV -D_POSIX_SOURCE -D_XOPEN_SOURCE -DByteSwapped
++#define StdDefines  -D_POSIX_SOURCE -D_XOPEN_SOURCE -DByteSwapped
+ #define ByteSwapped
+ #define Cstatic
  #define Cdynamic
  #define CppCommand '/usr/bin/cpp -traditional'
  #define CCompiler   gcc
 -#define FCompiler   g77
- #define CtoFLibraries   -lg2c -lgcc -lm
- #define CcOptions      -ansi
+-#define CtoFLibraries   -lg2c -lgcc -lm
+-#define CcOptions      -ansi
  #define XToolLibrary    -lXt -lSM -lICE
+ #define BuildShared NO
+ #define XLibrary -lX11 -lXext


Index: ncarg.spec
===================================================================
RCS file: /cvs/extras/rpms/ncarg/FC-6/ncarg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ncarg.spec	19 Jan 2007 22:23:40 -0000	1.9
+++ ncarg.spec	22 Jan 2007 17:37:41 -0000	1.10
@@ -9,6 +9,10 @@
 Source1:        Site.local
 Source2:        ncarg.csh
 Source3:        ncarg.sh
+Patch1:         ncarg-4.4.1-config.patch
+Patch2:         ncarg-4.4.1-include.patch
+Patch3:         ncarg-4.4.1-rpmroot.patch
+Patch4:         ncarg-4.4.1-deps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel
@@ -28,6 +32,10 @@
 
 %prep
 %setup -q
+%patch1 -p 1 -b .config
+%patch2 -p 1 -b .include
+%patch3 -p 1 -b .rpmroot
+%patch4 -p 1 -b .deps
 cp %{SOURCE1} config
 #Fix up the lib install dir
 sed -i -e s,/LIB/,/%{_lib}/, config/Site.local %{SOURCE2} %{SOURCE3}
@@ -103,7 +111,7 @@
 %{_bindir}/tgks0a
 %{_bindir}/tlocal
 %dir %{_libdir}/ncarg
-%{_libdir}/ncarg/ncarg/data/
+%dir %{_libdir}/ncarg/ncarg
 %{_libdir}/ncarg/ncarg/database/
 %{_libdir}/ncarg/ncarg/fontcaps/
 %{_libdir}/ncarg/ncarg/graphcaps/
@@ -124,7 +132,6 @@
 %{_libdir}/ncarg/libncarg_gks.a
 %{_libdir}/ncarg/libncarg_ras.a
 %{_libdir}/ncarg/libngmath.a
-%{_libdir}/ncarg/libsphere3.1_dp.a
 %{_libdir}/ncarg/ncarg/examples/
 %{_libdir}/ncarg/ncarg/tests/
 %{_libdir}/ncarg/ncarg/tutorial/
@@ -132,8 +139,11 @@
 
 
 %changelog
-* Fri Jan 19 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-6
+* Mon Jan 22 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-6
 - Revert to 4.4.1, no 4.4.2 ever was released into the wild.
+- Add patch to fix NCARG_ROOT in binaries.
+- Add patch to fix dependency in fontcap.
+- Tweak compile defines
 
 * Fri Jan 19 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-3
 - Never seemed to make it into FC6