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.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-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..c550887 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: 4%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -41,7 +41,9 @@ 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 +# 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 @@ -49,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 @@ -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 {} + @@ -182,14 +185,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 +272,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 +325,28 @@ 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-4 +- Add BR flex-static + +* Mon Nov 22 2010 - Orion Poplawski - 5.2.1-3 +- Add compatibility links to /usr/lib/ncarg + +* 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 + * 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