rpms/ncarg/devel .cvsignore, 1.2, 1.3 Site.local, 1.2, 1.3 ncarg.csh, 1.4, 1.5 ncarg.sh, 1.4, 1.5 ncarg.spec, 1.13, 1.14 sources, 1.2, 1.3 ncarg-4.4.1-config.patch, 1.2, NONE ncarg-4.4.1-include.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue Jun 26 22:46:10 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/ncarg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9254
Modified Files:
.cvsignore Site.local ncarg.csh ncarg.sh ncarg.spec sources
Removed Files:
ncarg-4.4.1-config.patch ncarg-4.4.1-include.patch
Log Message:
Update to 4.4.2
Remove unneeded patches
make LIB substitution more robust
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Feb 2006 17:12:53 -0000 1.2
+++ .cvsignore 26 Jun 2007 22:45:35 -0000 1.3
@@ -1 +1 @@
-ncarg-4.4.1.src.tar.gz
+ncarg_src-4.4.2.tar.gz
Index: Site.local
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/Site.local,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Site.local 3 Oct 2006 21:59:30 -0000 1.2
+++ Site.local 26 Jun 2007 22:45:35 -0000 1.3
@@ -1,26 +1,14 @@
-/*
- * This file was created by the Configure script.
- */
-
-#ifdef FirstSite
-
-#endif /* FirstSite */
-
-
-#ifdef SecondSite
-
#define YmakeRoot $(RPM_BUILD_ROOT)/usr
#define ManRoot $(RPM_BUILD_ROOT)/usr/share/man
-#define LibRoot $(RPM_BUILD_ROOT)/usr/LIB/ncarg
-
-
+#define LibRoot $(RPM_BUILD_ROOT)/usr/@LIB@/ncarg
+#define StdDefines -D_POSIX_SOURCE -D_XOPEN_SOURCE -DByteSwapped
#define CcOptions $(RPM_OPT_FLAGS)
#define FcOptions $(RPM_OPT_FLAGS)
#define BuildWithF90 TRUE
#define FCompiler gfortran
#define CtoFLibraries -lgfortran -lm
-#define LibSearch -L/usr/lib64/hdf -L/usr/lib/hdf
+#define LibSearch -L/usr/@LIB@/hdf
#define BuildUdunits FALSE
#define UdUnitslib
@@ -28,6 +16,3 @@
#define HDFEOSlib
#define BuildV5D TRUE
#define BuildDODS FALSE
-
-
-#endif /* SecondSite */
Index: ncarg.csh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/ncarg.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncarg.csh 12 Feb 2007 23:03:55 -0000 1.4
+++ ncarg.csh 26 Jun 2007 22:45:35 -0000 1.5
@@ -1,2 +1,2 @@
setenv NCARG_ROOT /usr
-setenv NCARG_LIB /usr/LIB/ncarg
+setenv NCARG_LIB /usr/@LIB@/ncarg
Index: ncarg.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/ncarg.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncarg.sh 12 Feb 2007 23:03:55 -0000 1.4
+++ ncarg.sh 26 Jun 2007 22:45:35 -0000 1.5
@@ -1,2 +1,2 @@
export NCARG_ROOT=/usr
-export NCARG_LIB=/usr/LIB/ncarg
+export NCARG_LIB=/usr/@LIB@/ncarg
Index: ncarg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/ncarg.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ncarg.spec 24 May 2007 05:52:09 -0000 1.13
+++ ncarg.spec 26 Jun 2007 22:45:35 -0000 1.14
@@ -1,16 +1,14 @@
Name: ncarg
-Version: 4.4.1
-Release: 10%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
Summary: A Fortran and C based software package for scientific visualization
Group: Development/Libraries
License: GPL
-URL: http://ngwww.ucar.edu/ng4.4/index.html
-Source0: http://ngwww.ucar.edu/ngbin/ncarg-%{version}.src.tar.gz
+URL: http://www.ncarg.ucar.edu/ng/index.html
+Source0: http://www.ncarg.ucar.edu/ngbin/ncarg_src-%{version}.tar.gz
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
Patch5: ncarg-4.4.1-ppc64.patch
@@ -33,15 +31,13 @@
%prep
%setup -q
-%patch1 -p 1 -b .config
-%patch2 -p 1 -b .include
%patch3 -p 1 -b .rpmroot
%patch4 -p 1 -b .deps
%patch5 -p 1 -b .ppc64
cp %{SOURCE1} config
#Fix up the lib install dir
cp %{SOURCE2} %{SOURCE3} .
-sed -i -e s,/LIB/,/%{_lib}/, config/Site.local ncarg.csh ncarg.sh
+sed -i -e s, at LIB@,%{_lib},g config/Site.local ncarg.csh ncarg.sh
%build
@@ -115,6 +111,7 @@
%{_bindir}/tlocal
%dir %{_libdir}/ncarg
%dir %{_libdir}/ncarg/ncarg
+%{_libdir}/ncarg/ncarg/data/
%{_libdir}/ncarg/ncarg/database/
%{_libdir}/ncarg/ncarg/fontcaps/
%{_libdir}/ncarg/ncarg/graphcaps/
@@ -142,6 +139,9 @@
%changelog
+* Tue Jun 26 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-1
+- Update to 4.4.2
+
* Wed May 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-10
- Build for ppc64
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Feb 2006 17:12:53 -0000 1.2
+++ sources 26 Jun 2007 22:45:35 -0000 1.3
@@ -1 +1 @@
-f62f226acc8b5588ff3537f28ac85a7d ncarg-4.4.1.src.tar.gz
+141a49fc1f3070ddc788a81193012e2f ncarg_src-4.4.2.tar.gz
--- ncarg-4.4.1-config.patch DELETED ---
--- ncarg-4.4.1-include.patch DELETED ---
More information about the fedora-extras-commits
mailing list