rpms/ncarg/F-7 ncarg-4.4.2-ppc64.patch, NONE, 1.1 .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.11, 1.12 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
Thu Dec 20 18:28:01 UTC 2007
- Previous message: rpms/glade3/F-8 glade3-3.4.1-desktop.patch, NONE, 1.1 glade3-3.4.0-desktop.patch, 1.1, NONE
- Next message: rpms/glade3/devel glade3-3.4.1-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 glade3.spec, 1.3, 1.4 sources, 1.2, 1.3 glade3-3.4.0-desktop.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/ncarg/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4673/F-7
Modified Files:
.cvsignore Site.local ncarg.csh ncarg.sh ncarg.spec sources
Added Files:
ncarg-4.4.2-ppc64.patch
Removed Files:
ncarg-4.4.1-config.patch ncarg-4.4.1-include.patch
Log Message:
Sync to devel
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/F-7/.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 20 Dec 2007 18:27:27 -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/F-7/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 20 Dec 2007 18:27:27 -0000 1.3
@@ -1,26 +1,11 @@
-/*
- * 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 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 +13,3 @@
#define HDFEOSlib
#define BuildV5D TRUE
#define BuildDODS FALSE
-
-
-#endif /* SecondSite */
Index: ncarg.csh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/F-7/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 20 Dec 2007 18:27:27 -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/F-7/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 20 Dec 2007 18:27:27 -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/F-7/ncarg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ncarg.spec 12 Feb 2007 23:03:55 -0000 1.11
+++ ncarg.spec 20 Dec 2007 18:27:27 -0000 1.12
@@ -1,23 +1,23 @@
Name: ncarg
-Version: 4.4.1
-Release: 9%{?dist}
+Version: 4.4.2
+Release: 5%{?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
+License: GPLv2+
+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.2-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel
BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
+
%description
NCAR Graphics is a Fortran and C based software package for scientific
visualization.
@@ -26,20 +26,29 @@
Summary: A Fortran and C based software package for scientific visualization
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: libXext-devel
%description devel
Include files and libraries for NCAR Graphics
+
%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
+#Use ppc config if needed
+%ifarch ppc ppc64
+cp config/LINUX.ppc32.GNU config/LINUX
+%endif
+#Remove -DSYSV from StdDefines
+sed -i -e /StdDefines/s/-DSYSV// config/LINUX
+#Add RPM_OPT_FLAGS
+sed -i -e '/cOptions/s/$/ $(RPM_OPT_FLAGS)/' config/LINUX
%build
@@ -113,6 +122,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/
@@ -123,6 +133,7 @@
%{_mandir}/man5/*.gz
%files devel
+%defattr(-,root,root,-)
%{_bindir}/ncargcc
%{_bindir}/ncargex
%{_bindir}/ncargf90
@@ -140,6 +151,25 @@
%changelog
+* Thu Dec 20 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-5
+- Add Requires libXext-devel to -devel package
+
+* Thu Aug 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-4
+- Update license tag to GPLv2+
+- Rebuild for ppc32
+
+* Thu Jun 28 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-3
+- Add missing defattr to devel package
+
+* Wed Jun 27 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-2
+- Try to fix up ppc64 build
+
+* 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
+
* Mon Feb 12 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-9
- Fix up the source files that were modified then checked in :-(.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/F-7/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 20 Dec 2007 18:27:27 -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 ---
- Previous message: rpms/glade3/F-8 glade3-3.4.1-desktop.patch, NONE, 1.1 glade3-3.4.0-desktop.patch, 1.1, NONE
- Next message: rpms/glade3/devel glade3-3.4.1-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 glade3.spec, 1.3, 1.4 sources, 1.2, 1.3 glade3-3.4.0-desktop.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list