rpms/hdf5/EL-6 .cvsignore, 1.13, 1.14 hdf5.spec, 1.40, 1.41 import.log, 1.1, 1.2 sources, 1.13, 1.14 hdf5-1.8.0-longdouble.patch, 1.3, NONE hdf5-1.8.3-snap12-signal.patch, 1.1, NONE hdf5-1.8.4-tstlite.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/hdf5/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11392/EL-6

Modified Files:
	.cvsignore hdf5.spec import.log sources 
Removed Files:
	hdf5-1.8.0-longdouble.patch hdf5-1.8.3-snap12-signal.patch 
	hdf5-1.8.4-tstlite.patch 
Log Message:
Update to 1.8.5 from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 May 2010 21:23:04 -0000	1.13
+++ .cvsignore	21 Jun 2010 22:01:13 -0000	1.14
@@ -1 +1 @@
-hdf5-1.8.4-patch1.tar.bz2
+hdf5-1.8.5.tar.bz2


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-6/hdf5.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- hdf5.spec	12 May 2010 15:11:14 -0000	1.40
+++ hdf5.spec	21 Jun 2010 22:01:14 -0000	1.41
@@ -1,23 +1,15 @@
-%define snaprel -patch1
+%define snaprel %{nil}
 Name: hdf5
-Version: 1.8.4.patch1
-Release: 1%{?dist}.1
+Version: 1.8.5
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/
 #Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
-#Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
-Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.4%{?snaprel}.tar.bz2
+Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
 Source1: h5comp
-Patch0: hdf5-1.8.0-longdouble.patch
-Patch1: hdf5-1.8.3-snap12-signal.patch
 Patch3: hdf5-1.8.0-multiarch.patch
-# There is a problem with the h5ltread_dataset_string_f() api in that the 
-# string will be NULL terminated.  The tstlite test ends up crashing with
-# a stack smash.  Reported upstream 9/30/2009, but probably will take a bit
-# of work to fix.  This disables that test
-Patch4: hdf5-1.8.4-tstlite.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -50,14 +42,8 @@ HDF5 static libraries.
 
 
 %prep
-#setup -q -n %{name}-%{version}%{?snaprel}
-%setup -q -n %{name}-1.8.4%{?snaprel}
-%ifarch ppc64
-%patch0 -p1 -b .longdouble
-%endif
-%patch1 -p1 -b .signal
+%setup -q -n %{name}-%{version}%{?snaprel}
 %patch3 -p1 -b .multiarch
-%patch4 -p1 -b .tstlite
 find -name '*.[ch]' -o -name '*.f90' -exec chmod -x {} +
 
 
@@ -70,8 +56,7 @@ export CFLAGS="${RPM_OPT_FLAGS/O2/O0}"
   --disable-dependency-tracking \
   --enable-cxx \
   --enable-fortran \
-  --enable-hl \
-  --with-ssl
+  --enable-hl
 # --enable-cxx/fortran and --enable-parallel flags are incompatible
 #  --with-mpe=DIR          Use MPE instrumentation [default=no]
 # --enable-cxx/fortran/parallel and --enable-threadsafe flags are incompatible
@@ -163,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/*.settings
 %{_fmoddir}/*.mod
+%{_datadir}/hdf5_examples/
 
 %files static
 %defattr(-,root,root,-)
@@ -170,8 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed May 12 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.4.patch1-1.1
-- Re-add longdouble patch for ppc64 for EPEL
+* Mon Jun 21 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.5-1
+- Update to 1.8.5
+- Drop patches fixed upstream
 
 * Mon Mar 1 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.4.patch1-1
 - Update to 1.8.4-patch1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 May 2010 21:23:04 -0000	1.1
+++ import.log	21 Jun 2010 22:01:14 -0000	1.2
@@ -1 +1,2 @@
 hdf5-1_8_4_patch1-1_fc14:EL-6:hdf5-1.8.4.patch1-1.fc14.src.rpm:1273526522
+hdf5-1_8_5-1_fc14:EL-6:hdf5-1.8.5-1.fc14.src.rpm:1277157627


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 May 2010 21:23:04 -0000	1.13
+++ sources	21 Jun 2010 22:01:14 -0000	1.14
@@ -1 +1 @@
-b19f4dfbf654a2af3653c492fc1c7513  hdf5-1.8.4-patch1.tar.bz2
+a400fe6c1c5964a7224dc684225d415c  hdf5-1.8.5.tar.bz2


--- hdf5-1.8.0-longdouble.patch DELETED ---


--- hdf5-1.8.3-snap12-signal.patch DELETED ---


--- hdf5-1.8.4-tstlite.patch DELETED ---