From 7ec2dd36b6199891f5d2449fc686701976746d2c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:20:05 +0000 Subject: [PATCH 01/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3cf2911..81a5615 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ncl -# $Id$ +# $Id: Makefile,v 1.1 2008/02/28 19:52:39 kevin Exp $ NAME := ncl SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 013cc2fc220d46751667e10ed362df239b6f30c6 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 8 Dec 2009 20:29:39 +0000 Subject: [PATCH 02/13] - Explicitly BR g2clib-static in accordance with the Packaging Guidelines (g2clib-devel is still static-only). --- ncl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ncl.spec b/ncl.spec index 2be534c..532ca94 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -43,7 +43,7 @@ Patch15: ncl-5.0.0-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel -BuildRequires: g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel +BuildRequires: g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel BuildRequires: byacc, flex @@ -303,6 +303,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 8 2009 Michael Schwendt - 5.1.1-4 +- Explicitly BR g2clib-static in accordance with the Packaging + Guidelines (g2clib-devel is still static-only). + * Sat Jul 25 2009 Fedora Release Engineering - 5.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 6c6b5136491c02a1ab85a84d410eb60f5b764bce Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 8 Dec 2009 21:39:37 +0000 Subject: [PATCH 03/13] - Same as below with hdf-static - Explicitly BR g2clib-static in accordance with the Packaging Guidelines (g2clib-devel is still static-only). --- ncl.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ncl.spec b/ncl.spec index 532ca94..11d7d8d 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -42,7 +42,8 @@ Patch13: ncl-5.1.0-includes.patch Patch15: ncl-5.0.0-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel +BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel +BuildRequires: hdf-static, hdf-devel >= 4.2r2, libjpeg-devel BuildRequires: g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel @@ -303,7 +304,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Dec 8 2009 Michael Schwendt - 5.1.1-4 +* Tue Dec 8 2009 Michael Schwendt - 5.1.1-5 +- Same as below with hdf-static - Explicitly BR g2clib-static in accordance with the Packaging Guidelines (g2clib-devel is still static-only). From 38cfbd8f0408ab6080b6ca423a1889523ef8322a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 17 Feb 2010 00:05:41 +0000 Subject: [PATCH 04/13] - Add patch to fix FTBFS bug #564856 --- ncl-5.1.1-libs.patch | 11 +++++++++++ ncl.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ncl-5.1.1-libs.patch diff --git a/ncl-5.1.1-libs.patch b/ncl-5.1.1-libs.patch new file mode 100644 index 0000000..2d8db82 --- /dev/null +++ b/ncl-5.1.1-libs.patch @@ -0,0 +1,11 @@ +--- ncl_ncarg-5.1.1/ncarview/src/bin/ictrans/yMakefile.libs 1998-02-04 08:58:14.000000000 -0700 ++++ ncl_ncarg-5.1.1/ncarview/src/bin/ictrans/yMakefile 2010-02-16 17:01:18.942677616 -0700 +@@ -29,6 +29,8 @@ + + #ifdef IRIX + MORE_LIBS = -lmalloc ++#else ++MORE_LIBS = -lm + #endif + + EXTRA_LIBS = $(X11LIBS) $(SUNLIBS) $(NETCDFLIB) $(HDFLIB) $(CTOFLIBS) diff --git a/ncl.spec b/ncl.spec index 11d7d8d..dd6e1d1 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -29,6 +29,8 @@ Source3: ncarg.sh Patch0: ncl-5.1.0-paths.patch Patch1: ncarg-4.4.1-deps.patch Patch2: ncl-5.1.0-ppc64.patch +# Add needed -lm to ictrans build +Patch3: ncl-5.1.1-libs.patch Patch7: ncl-5.0.0-atlas.patch # don't have the installation target depends on the build target since # for library it implies running ranlib and modifying the library timestamp @@ -116,6 +118,7 @@ Example programs and data using NCL. %patch0 -p1 -b .paths %patch1 -p1 -b .deps %patch2 -p1 -b .ppc64 +%patch3 -p1 -b .libs %patch7 -p1 -b .atlas %patch10 -p1 -b .no_install_dep %patch11 -p1 -b .build_n_scripts @@ -304,6 +307,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 16 2010 - Orion Poplawski - 5.1.1-6 +- Add patch to fix FTBFS bug #564856 + * Tue Dec 8 2009 Michael Schwendt - 5.1.1-5 - Same as below with hdf-static - Explicitly BR g2clib-static in accordance with the Packaging From 591789355793ca7ea00e56517ffe3421c08e1c8c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 28 Apr 2010 21:33:18 +0000 Subject: [PATCH 05/13] - Update to 5.2.0 - Update libs patch - Fixup profile script packaging --- .cvsignore | 2 +- Site.local.ncl | 10 ++++++++-- ncl-5.1.1-libs.patch | 11 ----------- ncl-5.2.0-libs.patch | 24 ++++++++++++++++++++++++ ncl.spec | 24 ++++++++++++++++-------- sources | 2 +- 6 files changed, 50 insertions(+), 23 deletions(-) delete mode 100644 ncl-5.1.1-libs.patch create mode 100644 ncl-5.2.0-libs.patch diff --git a/.cvsignore b/.cvsignore index adc1ab7..3634652 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ncl_ncarg_src-5.1.1.tar.gz +ncl_ncarg_src-5.2.0.tar.gz diff --git a/Site.local.ncl b/Site.local.ncl index f0125fc..897a534 100644 --- a/Site.local.ncl +++ b/Site.local.ncl @@ -4,12 +4,18 @@ #define SharePath $(DESTDIR)@datadir@ #define BuildWithF90 TRUE -#define IncSearch -I/usr/include/netcdf +#define IncSearch -I/usr/include/netcdf -I/usr/include/udunits2 #define LibSearch -L@libdir@/hdf -#define BuildNetCDF4 0 +#define BuildNetCDF4 1 +#define NetCDF4lib -lnetcdf #define BuildV5D 0 #define BuildHDFEOS 0 +#define BuildHDFEOS5 0 #define BuildTRIANGLE 0 #define V5Dlib #define BuildDODS 1 +#define HDFlib -lmfhdf -ldf -ljpeg -lz +#define BuildUdunits 1 +#define UdUnitslib -ludunits2 + diff --git a/ncl-5.1.1-libs.patch b/ncl-5.1.1-libs.patch deleted file mode 100644 index 2d8db82..0000000 --- a/ncl-5.1.1-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ncl_ncarg-5.1.1/ncarview/src/bin/ictrans/yMakefile.libs 1998-02-04 08:58:14.000000000 -0700 -+++ ncl_ncarg-5.1.1/ncarview/src/bin/ictrans/yMakefile 2010-02-16 17:01:18.942677616 -0700 -@@ -29,6 +29,8 @@ - - #ifdef IRIX - MORE_LIBS = -lmalloc -+#else -+MORE_LIBS = -lm - #endif - - EXTRA_LIBS = $(X11LIBS) $(SUNLIBS) $(NETCDFLIB) $(HDFLIB) $(CTOFLIBS) diff --git a/ncl-5.2.0-libs.patch b/ncl-5.2.0-libs.patch new file mode 100644 index 0000000..b78e0db --- /dev/null +++ b/ncl-5.2.0-libs.patch @@ -0,0 +1,24 @@ +diff -up ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile.libs ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile +--- ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile.libs 1998-02-04 08:58:14.000000000 -0700 ++++ ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile 2010-04-28 13:35:00.892361794 -0600 +@@ -29,6 +29,8 @@ DEP_LIBS = $(DEPICTRANSLIB) $(DEPCTRANSL + + #ifdef IRIX + MORE_LIBS = -lmalloc ++#else ++MORE_LIBS = -lm + #endif + + EXTRA_LIBS = $(X11LIBS) $(SUNLIBS) $(NETCDFLIB) $(HDFLIB) $(CTOFLIBS) +diff -up ncl_ncarg-5.2.0/ni/src/ncl/yMakefile.libs ncl_ncarg-5.2.0/ni/src/ncl/yMakefile +--- ncl_ncarg-5.2.0/ni/src/ncl/yMakefile.libs 2010-03-15 20:01:01.000000000 -0600 ++++ ncl_ncarg-5.2.0/ni/src/ncl/yMakefile 2010-04-28 13:56:25.401421261 -0600 +@@ -121,7 +121,7 @@ DODS_LIBS = -lnc-dap -ldap -ldapclient - + #elif defined(Darwin) + DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lxml2 -lpthread -lssl + #elif defined(linux) +-DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lidn -ldl ++DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread + #else + DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lssl + #endif diff --git a/ncl.spec b/ncl.spec index dd6e1d1..a766475 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,12 +1,12 @@ Name: ncl -Version: 5.1.1 -Release: 6%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering License: BSD URL: http://www.ncl.ucar.edu -# You must register for a free account at http://www.earthsystemgrid.org/ before being able to download the source. +# You must register for a free account at http://esg.ucar.edu/ before being able to download the source. Source0: ncl_ncarg_src-%{version}.tar.gz Source1: Site.local.ncl Source2: ncarg.csh @@ -29,8 +29,8 @@ Source3: ncarg.sh Patch0: ncl-5.1.0-paths.patch Patch1: ncarg-4.4.1-deps.patch Patch2: ncl-5.1.0-ppc64.patch -# Add needed -lm to ictrans build -Patch3: ncl-5.1.1-libs.patch +# Add needed -lm to ictrans build, remove unneeded -lidn -ldl from ncl +Patch3: ncl-5.2.0-libs.patch Patch7: ncl-5.0.0-atlas.patch # don't have the installation target depends on the build target since # for library it implies running ranlib and modifying the library timestamp @@ -50,9 +50,9 @@ BuildRequires: g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel BuildRequires: byacc, flex -BuildRequires: udunits-devel +BuildRequires: udunits2-devel Requires: %{name}-common = %{version}-%{release} -Requires: udunits +Requires: udunits2 Provides: ncarg = %{version}-%{release} Obsoletes: ncarg < %{version}-%{release} @@ -125,6 +125,8 @@ Example programs and data using NCL. %patch12 -p1 -b .netcdff %patch13 -p1 -b .includes %patch15 -p1 -b .udunits +#Spurrious exec permissions +find -name '*.[fh]' -exec chmod -x {} + #Use ppc config if needed %ifarch ppc ppc64 @@ -199,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING Copyright README -%{_sysconfdir}/profile.d/ncarg.*sh +%config(noreplace) %{_sysconfdir}/profile.d/ncarg.*sh %{_bindir}/ConvertMapData %{_bindir}/WriteLineFile %{_bindir}/WriteNameFile @@ -256,6 +258,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ncarg/colormaps/ %{_datadir}/ncarg/data/ %{_datadir}/ncarg/grib2_codetables/ +%{_datadir}/ncarg/grib2_codetables.previous/ %{_datadir}/ncarg/nclscripts/ %{_datadir}/ncarg/ngwww/ %{_datadir}/ncarg/sysresfile/ @@ -307,6 +310,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 28 2010 - Orion Poplawski - 5.2.0-1 +- Update to 5.2.0 +- Update libs patch +- Fixup profile script packaging + * Tue Feb 16 2010 - Orion Poplawski - 5.1.1-6 - Add patch to fix FTBFS bug #564856 diff --git a/sources b/sources index 6f0e3c2..e77a34c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42154992f2966320dc9f8958b9d81da3 ncl_ncarg_src-5.1.1.tar.gz +7ed710647a7eec8f500c7494853a2b65 ncl_ncarg_src-5.2.0.tar.gz From 58bbcaabfe0c5fb4c86ef3b5eb12d34c8367285f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Jul 2010 22:01:02 +0000 Subject: [PATCH 06/13] - Drop BR libnc-dap and update lib patch to remove unneeded libraries --- ncl-5.2.0-libs.patch | 2 +- ncl.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ncl-5.2.0-libs.patch b/ncl-5.2.0-libs.patch index b78e0db..64a1b84 100644 --- a/ncl-5.2.0-libs.patch +++ b/ncl-5.2.0-libs.patch @@ -18,7 +18,7 @@ diff -up ncl_ncarg-5.2.0/ni/src/ncl/yMakefile.libs ncl_ncarg-5.2.0/ni/src/ncl/yM DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lxml2 -lpthread -lssl #elif defined(linux) -DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lidn -ldl -+DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread ++DODS_LIBS = -lcurl -lrx -lpthread #else DODS_LIBS = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lssl #endif diff --git a/ncl.spec b/ncl.spec index a766475..c78dc2e 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel BuildRequires: hdf-static, hdf-devel >= 4.2r2, libjpeg-devel -BuildRequires: g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel +BuildRequires: g2clib-static, g2clib-devel, librx-devel, atlas-devel # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel BuildRequires: byacc, flex @@ -310,6 +310,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 1 2010 - Orion Poplawski - 5.2.0-2 +- Drop BR libnc-dap and update lib patch to remove unneeded libraries + * Wed Apr 28 2010 - Orion Poplawski - 5.2.0-1 - Update to 5.2.0 - Update libs patch From 03293d30e24692b4d015fb9f2aa3ecf216d03346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 04:06:38 +0000 Subject: [PATCH 07/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 81a5615..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ncl -# $Id: Makefile,v 1.1 2008/02/28 19:52:39 kevin Exp $ -NAME := ncl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 283fa724c9a0cae5d23b4de310052488c9824781 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Aug 2010 13:05:21 -0600 Subject: [PATCH 08/13] * Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 - Update to 5.2.1 - Update udunits patch --- .gitignore | 1 + ncl-5.0.0-udunits.patch => ncl-5.2.1-udunits.patch | 9 +++++---- ncl.spec | 10 +++++++--- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) rename ncl-5.0.0-udunits.patch => ncl-5.2.1-udunits.patch (50%) diff --git a/.gitignore b/.gitignore index 3634652..516cd44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ncl_ncarg_src-5.2.0.tar.gz +ncl_ncarg_src-5.2.1.tar.gz diff --git a/ncl-5.0.0-udunits.patch b/ncl-5.2.1-udunits.patch similarity index 50% rename from ncl-5.0.0-udunits.patch rename to ncl-5.2.1-udunits.patch index 3bb1304..c849918 100644 --- a/ncl-5.0.0-udunits.patch +++ b/ncl-5.2.1-udunits.patch @@ -1,10 +1,11 @@ ---- ncl_ncarg-5.0.0/config/Project.udunits 2008-12-08 15:35:46.000000000 -0700 -+++ ncl_ncarg-5.0.0/config/Project 2008-12-08 15:50:44.000000000 -0700 -@@ -328,7 +328,7 @@ +diff -up ncl_ncarg-5.2.1/config/Project.udunits ncl_ncarg-5.2.1/config/Project +--- ncl_ncarg-5.2.1/config/Project.udunits 2010-08-10 13:01:03.000000000 -0600 ++++ ncl_ncarg-5.2.1/config/Project 2010-08-10 13:02:36.052660865 -0600 +@@ -392,7 +392,7 @@ NGENV_DESCRIPT = \ "graphcaps",NULL,"ncarg",NULL,NULL, \ "colormaps",NULL,"ncarg",NULL,NULL, \ "rangs","NCARG_RANGS","database",NULL,NULL, \ -- "udunits","UDUNITS_PATH","ncarg",NULL,NULL, \ +- "udunits","NCARG_UDUNITS","ncarg",NULL,NULL, \ + "udunits","UDUNITS_PATH",NULL,"/etc","udunits.dat", \ "psadilookup","PSADILOOKUP_PATH",NULL,NULL,NULL,\ "examples",NULL,"ncarg",NULL,NULL, \ diff --git a/ncl.spec b/ncl.spec index c78dc2e..507c587 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -41,7 +41,7 @@ Patch11: ncl-5.0.0-build_n_scripts.patch Patch12: ncl-5.1.0-netcdff.patch Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat -Patch15: ncl-5.0.0-udunits.patch +Patch15: ncl-5.2.1-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel @@ -310,6 +310,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 +- Update to 5.2.1 +- Update udunits patch + * Thu Jul 1 2010 - Orion Poplawski - 5.2.0-2 - Drop BR libnc-dap and update lib patch to remove unneeded libraries diff --git a/sources b/sources index e77a34c..69149cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ed710647a7eec8f500c7494853a2b65 ncl_ncarg_src-5.2.0.tar.gz +c7ba4847961f38bbbac30ac042eab43a ncl_ncarg_src-5.2.1.tar.gz From f413f52df84cc8d03268c51dc97aa9f4e1620a5b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Aug 2010 13:05:21 -0600 Subject: [PATCH 09/13] * Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 - Update to 5.2.1 - Update udunits patch --- .gitignore | 1 + ncl-5.0.0-udunits.patch => ncl-5.2.1-udunits.patch | 9 +++++---- ncl.spec | 10 +++++++--- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) rename ncl-5.0.0-udunits.patch => ncl-5.2.1-udunits.patch (50%) diff --git a/.gitignore b/.gitignore index 3634652..516cd44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ncl_ncarg_src-5.2.0.tar.gz +ncl_ncarg_src-5.2.1.tar.gz diff --git a/ncl-5.0.0-udunits.patch b/ncl-5.2.1-udunits.patch similarity index 50% rename from ncl-5.0.0-udunits.patch rename to ncl-5.2.1-udunits.patch index 3bb1304..c849918 100644 --- a/ncl-5.0.0-udunits.patch +++ b/ncl-5.2.1-udunits.patch @@ -1,10 +1,11 @@ ---- ncl_ncarg-5.0.0/config/Project.udunits 2008-12-08 15:35:46.000000000 -0700 -+++ ncl_ncarg-5.0.0/config/Project 2008-12-08 15:50:44.000000000 -0700 -@@ -328,7 +328,7 @@ +diff -up ncl_ncarg-5.2.1/config/Project.udunits ncl_ncarg-5.2.1/config/Project +--- ncl_ncarg-5.2.1/config/Project.udunits 2010-08-10 13:01:03.000000000 -0600 ++++ ncl_ncarg-5.2.1/config/Project 2010-08-10 13:02:36.052660865 -0600 +@@ -392,7 +392,7 @@ NGENV_DESCRIPT = \ "graphcaps",NULL,"ncarg",NULL,NULL, \ "colormaps",NULL,"ncarg",NULL,NULL, \ "rangs","NCARG_RANGS","database",NULL,NULL, \ -- "udunits","UDUNITS_PATH","ncarg",NULL,NULL, \ +- "udunits","NCARG_UDUNITS","ncarg",NULL,NULL, \ + "udunits","UDUNITS_PATH",NULL,"/etc","udunits.dat", \ "psadilookup","PSADILOOKUP_PATH",NULL,NULL,NULL,\ "examples",NULL,"ncarg",NULL,NULL, \ diff --git a/ncl.spec b/ncl.spec index c78dc2e..507c587 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -41,7 +41,7 @@ Patch11: ncl-5.0.0-build_n_scripts.patch Patch12: ncl-5.1.0-netcdff.patch Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat -Patch15: ncl-5.0.0-udunits.patch +Patch15: ncl-5.2.1-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel @@ -310,6 +310,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 +- Update to 5.2.1 +- Update udunits patch + * Thu Jul 1 2010 - Orion Poplawski - 5.2.0-2 - Drop BR libnc-dap and update lib patch to remove unneeded libraries diff --git a/sources b/sources index e77a34c..69149cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ed710647a7eec8f500c7494853a2b65 ncl_ncarg_src-5.2.0.tar.gz +c7ba4847961f38bbbac30ac042eab43a ncl_ncarg_src-5.2.1.tar.gz From 4748f9d75f007609ab52063b28128956b91eea2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 6 Sep 2010 16:50:29 +0200 Subject: [PATCH 10/13] - Recognize Fedora secondary architectures --- ncl-5.2.1-secondary.patch | 13 +++++++++++++ ncl.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ncl-5.2.1-secondary.patch diff --git a/ncl-5.2.1-secondary.patch b/ncl-5.2.1-secondary.patch new file mode 100644 index 0000000..7ffffd7 --- /dev/null +++ b/ncl-5.2.1-secondary.patch @@ -0,0 +1,13 @@ +diff -up ncl_ncarg-5.2.1/config/ymake.secondary ncl_ncarg-5.2.1/config/ymake +--- ncl_ncarg-5.2.1/config/ymake.secondary 2010-09-06 10:16:02.587814170 -0400 ++++ ncl_ncarg-5.2.1/config/ymake 2010-09-06 10:38:59.887472612 -0400 +@@ -373,6 +373,9 @@ case Linux: + case i*64: + case x*64: + case ppc*: ++ case s390*: ++ case sparc*: ++ case arm*: + case alpha: + set model = $mach + set arch = $mach diff --git a/ncl.spec b/ncl.spec index 507c587..4dfaf67 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -42,6 +42,8 @@ Patch12: ncl-5.1.0-netcdff.patch Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat Patch15: ncl-5.2.1-udunits.patch +# Add Fedora secondary arches +Patch16: ncl-5.2.1-secondary.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel @@ -125,6 +127,7 @@ Example programs and data using NCL. %patch12 -p1 -b .netcdff %patch13 -p1 -b .includes %patch15 -p1 -b .udunits +%patch16 -p1 -b .secondary #Spurrious exec permissions find -name '*.[fh]' -exec chmod -x {} + @@ -310,6 +313,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 6 2010 - Dan Horák - 5.2.1-2 +- Recognize Fedora secondary architectures + * Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 - Update to 5.2.1 - Update udunits patch From 8f8e883c9c9b355a3911536e6076323a523df7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 6 Sep 2010 16:50:29 +0200 Subject: [PATCH 11/13] - Recognize Fedora secondary architectures --- ncl-5.2.1-secondary.patch | 13 +++++++++++++ ncl.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ncl-5.2.1-secondary.patch diff --git a/ncl-5.2.1-secondary.patch b/ncl-5.2.1-secondary.patch new file mode 100644 index 0000000..7ffffd7 --- /dev/null +++ b/ncl-5.2.1-secondary.patch @@ -0,0 +1,13 @@ +diff -up ncl_ncarg-5.2.1/config/ymake.secondary ncl_ncarg-5.2.1/config/ymake +--- ncl_ncarg-5.2.1/config/ymake.secondary 2010-09-06 10:16:02.587814170 -0400 ++++ ncl_ncarg-5.2.1/config/ymake 2010-09-06 10:38:59.887472612 -0400 +@@ -373,6 +373,9 @@ case Linux: + case i*64: + case x*64: + case ppc*: ++ case s390*: ++ case sparc*: ++ case arm*: + case alpha: + set model = $mach + set arch = $mach diff --git a/ncl.spec b/ncl.spec index 507c587..4dfaf67 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -42,6 +42,8 @@ Patch12: ncl-5.1.0-netcdff.patch Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat Patch15: ncl-5.2.1-udunits.patch +# Add Fedora secondary arches +Patch16: ncl-5.2.1-secondary.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel @@ -125,6 +127,7 @@ Example programs and data using NCL. %patch12 -p1 -b .netcdff %patch13 -p1 -b .includes %patch15 -p1 -b .udunits +%patch16 -p1 -b .secondary #Spurrious exec permissions find -name '*.[fh]' -exec chmod -x {} + @@ -310,6 +313,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 6 2010 - Dan Horák - 5.2.1-2 +- Recognize Fedora secondary architectures + * Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 - Update to 5.2.1 - Update udunits patch From 51a2e5b7639e3205a033ce5368cbbcc79bff3028 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 22 Nov 2010 11:03:43 -0700 Subject: [PATCH 12/13] - Add compatibility links to /usr/lib/ncarg --- ncl.spec | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/ncl.spec b/ncl.spec index 507c587..414d1e4 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -182,14 +182,20 @@ install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d # database, fontcaps, and graphcaps are arch dependent mv $RPM_BUILD_ROOT%{_datadir}/ncarg/{database,{font,graph}caps} \ $RPM_BUILD_ROOT%{_libdir}/ncarg/ +# Use system udunits +rm -r $RPM_BUILD_ROOT%{_datadir}/ncarg/udunits +# Compat links for what is left +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/ncarg +for x in $RPM_BUILD_ROOT%{_datadir}/ncarg/* +do + ln -s ../../share/ncarg/$(basename $x) $RPM_BUILD_ROOT%{_prefix}/lib/ncarg/ +done # Don't conflict with allegro-devel (generic API names) for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/* do manname=`basename $manpage` mv $manpage $RPM_BUILD_ROOT%{_mandir}/man3/%{name}_$manname done -# Use system udunits -rm -r $RPM_BUILD_ROOT%{_datadir}/ncarg/udunits # Remove $RPM_BUILD_ROOT from MakeNcl #sed -i -e s,$RPM_BUILD_ROOT,,g $RPM_BUILD_ROOT%{_bindir}/MakeNcl @@ -263,6 +269,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ncarg/ngwww/ %{_datadir}/ncarg/sysresfile/ %{_datadir}/ncarg/xapp/ +%dir %{_prefix}/lib/ncarg +%{_prefix}/lib/ncarg/colormaps +%{_prefix}/lib/ncarg/data +%{_prefix}/lib/ncarg/grib2_codetables +%{_prefix}/lib/ncarg/grib2_codetables.previous +%{_prefix}/lib/ncarg/nclscripts +%{_prefix}/lib/ncarg/ngwww +%{_prefix}/lib/ncarg/sysresfile +%{_prefix}/lib/ncarg/xapp %{_mandir}/man1/*.gz %{_mandir}/man5/*.gz %{_bindir}/scrip_check_input @@ -307,9 +322,18 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ncarg/resfiles/ %{_datadir}/ncarg/tests/ %{_datadir}/ncarg/tutorial/ +%{_prefix}/lib/ncarg/examples +%{_prefix}/lib/ncarg/hluex +%{_prefix}/lib/ncarg/nclex +%{_prefix}/lib/ncarg/resfiles +%{_prefix}/lib/ncarg/tests +%{_prefix}/lib/ncarg/tutorial %changelog +* Mon Nov 22 2010 - Orion Poplawski - 5.2.1-2 +- Add compatibility links to /usr/lib/ncarg + * Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 - Update to 5.2.1 - Update udunits patch From eb9dd1eb4eb3b420ec51e371f5514abf85ded0a4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 22 Nov 2010 11:41:16 -0700 Subject: [PATCH 13/13] - Add BR flex-static --- ncl.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ncl.spec b/ncl.spec index 698bf7d..c550887 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl Version: 5.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -51,7 +51,7 @@ BuildRequires: hdf-static, hdf-devel >= 4.2r2, libjpeg-devel BuildRequires: g2clib-static, g2clib-devel, librx-devel, atlas-devel # imake needed for makedepend BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel -BuildRequires: byacc, flex +BuildRequires: byacc, flex, flex-static BuildRequires: udunits2-devel Requires: %{name}-common = %{version}-%{release} Requires: udunits2 @@ -334,6 +334,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 22 2010 - Orion Poplawski - 5.2.1-4 +- Add BR flex-static + * Mon Nov 22 2010 - Orion Poplawski - 5.2.1-3 - Add compatibility links to /usr/lib/ncarg