rpms/hdf/devel .cvsignore, 1.2, 1.3 hdf.spec, 1.11, 1.12 sources, 1.2, 1.3 hdf-4.2r1-configure.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Fri Apr 20 17:17:07 UTC 2007
- Previous message: rpms/tasks/FC-6 tasks.spec,1.1,1.2
- Next message: rpms/hdf/EL-5 .cvsignore, 1.2, 1.3 hdf.spec, 1.11, 1.12 sources, 1.2, 1.3 hdf-4.2r1-configure.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/extras/rpms/hdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27318
Modified Files:
.cvsignore hdf.spec sources
Removed Files:
hdf-4.2r1-configure.patch
Log Message:
- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch
- Remove configure patch applied upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Jul 2005 18:07:39 -0000 1.2
+++ .cvsignore 20 Apr 2007 17:16:29 -0000 1.3
@@ -1,2 +1 @@
-4.2r1-hrepack-patch.tar
-HDF4.2r1.tar.gz
+4.2r1-hrepack-p4.tar.gz
Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hdf.spec 30 Aug 2006 02:36:31 -0000 1.11
+++ hdf.spec 20 Apr 2007 17:16:29 -0000 1.12
@@ -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 @@
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 @@
%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 @@
#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 @@
%{_includedir}/%{name}/
%{_libdir}/%{name}/
+
%changelog
+* Fri Apr 20 2007 Orion Poplawski <orion at cora.nwra.com> 4.2r1-12
+- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch
+- Remove configure patch applied upstream
+
* Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-11
- Rebuild for FC6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Jul 2005 18:07:39 -0000 1.2
+++ sources 20 Apr 2007 17:16:29 -0000 1.3
@@ -1,2 +1 @@
-d172631b6e6f32c4f93f647a09862011 4.2r1-hrepack-patch.tar
-9082c6fa913b9188452fa6c5217e1573 HDF4.2r1.tar.gz
+47e42192b00814d8f815b7b4f8243b01 4.2r1-hrepack-p4.tar.gz
--- hdf-4.2r1-configure.patch DELETED ---
- Previous message: rpms/tasks/FC-6 tasks.spec,1.1,1.2
- Next message: rpms/hdf/EL-5 .cvsignore, 1.2, 1.3 hdf.spec, 1.11, 1.12 sources, 1.2, 1.3 hdf-4.2r1-configure.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list