From 2b99ba6b6fb336ea5e4269533a71fe9b3917dcde Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 15:49:35 +0000 Subject: [PATCH 1/7] Initialize branch FC-6 for hdf --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 5af4e36386b418860ca9a52d95d8165f38030ae4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 20 Apr 2007 17:21:12 +0000 Subject: [PATCH 2/7] - Use 4.2r1-hrepack-p4.tar.gz for hrepack patch - Remove configure patch applied upstream --- .cvsignore | 3 +- hdf-4.2r1-configure.patch | 92 --------------------------------------- hdf.spec | 26 +++++++---- sources | 3 +- 4 files changed, 19 insertions(+), 105 deletions(-) delete mode 100644 hdf-4.2r1-configure.patch diff --git a/.cvsignore b/.cvsignore index 9d54fe8..9a20707 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -4.2r1-hrepack-patch.tar -HDF4.2r1.tar.gz +4.2r1-hrepack-p4.tar.gz diff --git a/hdf-4.2r1-configure.patch b/hdf-4.2r1-configure.patch deleted file mode 100644 index 5bfc1c3..0000000 --- a/hdf-4.2r1-configure.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- HDF4.2r1/configure.ac.orig 2005-07-15 14:52:14.000000000 -0600 -+++ HDF4.2r1/configure.ac 2005-07-15 14:53:35.000000000 -0600 -@@ -528,7 +528,7 @@ - dnl ====================================================================== - - AC_MSG_CHECKING([for math library support]) --AC_TRY_LINK([#include ], [sqrt(37.927)], -+AC_TRY_LINK([#include ], [sinh(37.927)], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]); LIBS="$LIBS -lm"]) - ---- HDF4.2r1/mfhdf/fortran/config/ftest-linux.f.orig 2005-02-08 20:04:07.000000000 -0700 -+++ HDF4.2r1/mfhdf/fortran/config/ftest-linux.f 2005-07-15 15:37:22.000000000 -0600 -@@ -138,13 +138,13 @@ - integer*2 shval(2) - integer i, j, k - character*31 varnam, attname(2,7), gattnam(2) -- byte bytval(2) -+ integer*1 bytval(2) - common /atts/attname, gattnam - integer*2 svalidrg(2) - real rvalidrg(2) - integer lvalidrg(2) - double precision dvalidrg(2) -- byte bvalidrg(2) -+ integer*1 bvalidrg(2) - character*31 gavalue(2), cavalue(2) - real epsilon - -@@ -337,7 +337,7 @@ - real flval(2) - integer lngval(2) - integer*2 shval(2) -- byte bytval(2) -+ integer*1 bytval(2) - integer vartyp, nvdims, vdims(MAXVDIMS), nvatts - - character*31 varnam, attname(2,7), gattnam(2) -@@ -346,7 +346,7 @@ - real rvalidrg(2) - integer lvalidrg(2) - double precision dvalidrg(2) -- byte bvalidrg(2) -+ integer*1 bvalidrg(2) - character*31 gavalue(2), cavalue(2) - real epsilon - -@@ -470,7 +470,7 @@ - real rvalidrg(2) - integer lvalidrg(2) - double precision dvalidrg(2) -- byte bvalidrg(2) -+ integer*1 bvalidrg(2) - - c variable ids - integer bid, sid, lid, fid, did, cid, chid -@@ -883,7 +883,7 @@ - integer itime, ilev, ilat, ilon - - c arrays of data values to be read -- byte barray(times), byval(times) -+ integer*1 barray(times), byval(times) - integer*2 sarray(times), shval(times) - integer larray(lats) - real farray(levels, lats, lons, times) -@@ -1009,7 +1009,7 @@ - integer bid, sid, lid, fid, did, cid, chid - common /vars/bid, sid, lid, fid, did, cid, chid - -- byte bvalue -+ integer*1 bvalue - integer*2 svalue - integer lvalue - real fvalue -@@ -1097,7 +1097,7 @@ - integer count(MAXNCDIM) - - c arrays of data values to be written -- byte barray(times) -+ integer*1 barray(times) - integer*2 sarray(times) - integer larray(lats) - real farray(levels, lats, lons, times) -@@ -1184,7 +1184,7 @@ - - integer lvalue - integer*2 svalue -- byte bvalue -+ integer*1 bvalue - double precision onethird - integer bid, sid, lid, fid, did, cid, chid - common /vars/bid, sid, lid, fid, did, cid, chid diff --git a/hdf.spec b/hdf.spec index 084949b..2318ddb 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,18 +1,18 @@ Name: hdf Version: 4.2r1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries URL: http://hdf.ncsa.uiuc.edu/hdf4.html -Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz -Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar -Patch0: hdf-4.2r1-configure.patch +#Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz +Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/4.2r1-hrepack-p4.tar.gz Patch1: hdf-4.2r1-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran + %description HDF is a general purpose library and file format for storing scientific data. HDF can store two primary objects: datasets and groups. A dataset is @@ -22,6 +22,7 @@ objects, one can create and store almost any kind of scientific data structure, such as images, arrays of vectors, and structured and unstructured grids. You can also mix and match them in HDF files according to your needs. + %package devel Summary: HDF development files Group: Development/Libraries @@ -31,20 +32,20 @@ Requires: libjpeg-devel zlib-devel netcdf-devel %description devel HDF development headers and libraries. + %prep -%setup -q -n HDF%{version} -tar xf %{SOURCE1} --directory mfhdf/hrepack -mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack -rm -r mfhdf/hrepack/4.2r1-hrepack-patch -%patch0 -p1 -b .orig +#%setup -q -n HDF%{version} +%setup -q -n 4.2r1-hrepack-p4 %patch1 -p1 -b .orig + %build autoconf export CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_NETCDF" %configure F77=gfortran FFLAGS=-ffixed-line-length-none make + %install rm -rf $RPM_BUILD_ROOT %makeinstall includedir=${RPM_BUILD_ROOT}%{_includedir}/%{name} \ @@ -52,9 +53,11 @@ rm -rf $RPM_BUILD_ROOT #Don't conflict with netcdf rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc* + %check make check + %clean rm -rf $RPM_BUILD_ROOT @@ -70,7 +73,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}/ %{_libdir}/%{name}/ + %changelog +* Fri Apr 20 2007 Orion Poplawski 4.2r1-12 +- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch +- Remove configure patch applied upstream + * Tue Aug 29 2006 Orion Poplawski 4.2r1-11 - Rebuild for FC6 diff --git a/sources b/sources index 0bc13c6..28db7db 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d172631b6e6f32c4f93f647a09862011 4.2r1-hrepack-patch.tar -9082c6fa913b9188452fa6c5217e1573 HDF4.2r1.tar.gz +47e42192b00814d8f815b7b4f8243b01 4.2r1-hrepack-p4.tar.gz From 04010afd92b2bf12d99a63e793ec3fc41d5747f3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 20 Apr 2007 21:20:41 +0000 Subject: [PATCH 3/7] - Use --disable-production configure flag to avoid stripping -g compile flag - Add patch to fix open file test when run under mock --- hdf-4.2r1p4-maxavailfiles.patch | 11 +++++++++++ hdf.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 hdf-4.2r1p4-maxavailfiles.patch diff --git a/hdf-4.2r1p4-maxavailfiles.patch b/hdf-4.2r1p4-maxavailfiles.patch new file mode 100644 index 0000000..9afa15d --- /dev/null +++ b/hdf-4.2r1p4-maxavailfiles.patch @@ -0,0 +1,11 @@ +--- 4.2r1-hrepack-p4/mfhdf/libsrc/file.c.maxavailfiles 2007-04-20 12:21:12.000000000 -0600 ++++ 4.2r1-hrepack-p4/mfhdf/libsrc/file.c 2007-04-20 12:21:50.000000000 -0600 +@@ -31,7 +31,7 @@ + + /* Maximum number of files can be opened at one time; subtract 3 from + the system allowed to account for stdin, stdout, and stderr */ +-#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3) ++#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10) + + static int _ncdf = 0 ; /* high water mark on open cdf's */ + static NC **_cdfs; diff --git a/hdf.spec b/hdf.spec index 2318ddb..05f3d01 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,6 +7,7 @@ Group: System Environment/Libraries URL: http://hdf.ncsa.uiuc.edu/hdf4.html #Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/4.2r1-hrepack-p4.tar.gz +Patch0: hdf-4.2r1p4-maxavailfiles.patch Patch1: hdf-4.2r1-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel @@ -36,13 +37,14 @@ HDF development headers and libraries. %prep #%setup -q -n HDF%{version} %setup -q -n 4.2r1-hrepack-p4 +%patch -p1 -b .maxavailfiles %patch1 -p1 -b .orig %build autoconf export CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_NETCDF" -%configure F77=gfortran FFLAGS=-ffixed-line-length-none +%configure F77=gfortran FFLAGS=-ffixed-line-length-none --disable-production make @@ -78,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT * Fri Apr 20 2007 Orion Poplawski 4.2r1-12 - Use 4.2r1-hrepack-p4.tar.gz for hrepack patch - Remove configure patch applied upstream +- Use --disable-production configure flag to avoid stripping -g compile flag +- Add patch to fix open file test when run under mock * Tue Aug 29 2006 Orion Poplawski 4.2r1-11 - Rebuild for FC6 From eb4022e2019634ea6a45a84cfbfd2ed886dc7cd7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 20 Apr 2007 21:36:58 +0000 Subject: [PATCH 4/7] More open files --- hdf-4.2r1p4-maxavailfiles.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf-4.2r1p4-maxavailfiles.patch b/hdf-4.2r1p4-maxavailfiles.patch index 9afa15d..8ff4f0c 100644 --- a/hdf-4.2r1p4-maxavailfiles.patch +++ b/hdf-4.2r1p4-maxavailfiles.patch @@ -5,7 +5,7 @@ /* Maximum number of files can be opened at one time; subtract 3 from the system allowed to account for stdin, stdout, and stderr */ -#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3) -+#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10) ++#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 12) static int _ncdf = 0 ; /* high water mark on open cdf's */ static NC **_cdfs; From 73cb43a58ce2328d02ec233de99e1b814b66cc71 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 10 May 2007 15:18:46 +0000 Subject: [PATCH 5/7] Remove netcdf-devel requires --- hdf.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hdf.spec b/hdf.spec index 05f3d01..a5d9e5d 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,6 +1,6 @@ Name: hdf Version: 4.2r1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -28,7 +28,7 @@ grids. You can also mix and match them in HDF files according to your needs. Summary: HDF development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libjpeg-devel zlib-devel netcdf-devel +Requires: libjpeg-devel zlib-devel %description devel HDF development headers and libraries. @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 10 2007 Orion Poplawski 4.2r1-13 +- Remove netcdf-devel requires. (bug #239631) + * Fri Apr 20 2007 Orion Poplawski 4.2r1-12 - Use 4.2r1-hrepack-p4.tar.gz for hrepack patch - Remove configure patch applied upstream From 748e9f7ce4f24973666416168d1f775a04c2f2d9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:19 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b9eae8..ed908b3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := hdf 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 da15bed8b63a005000ed771c71d489efbacd7682 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:40:01 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 ed908b3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: hdf -# $Id$ -NAME := hdf -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) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6