rpms/hdf5/devel .cvsignore, 1.15, 1.16 hdf5.spec, 1.42, 1.43 sources, 1.15, 1.16 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/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9390

Modified Files:
	.cvsignore hdf5.spec sources 
Removed Files:
	hdf5-1.8.3-snap12-signal.patch hdf5-1.8.4-tstlite.patch 
Log Message:
* Mon Jun 21 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.5-1
- Update to 1.8.5
- Drop patches fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	1 Mar 2010 16:11:37 -0000	1.15
+++ .cvsignore	21 Jun 2010 21:41:29 -0000	1.16
@@ -1 +1 @@
-hdf5-1.8.4-patch1.tar.bz2
+hdf5-1.8.5.tar.bz2


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- hdf5.spec	14 May 2010 22:54:30 -0000	1.42
+++ hdf5.spec	21 Jun 2010 21:41:30 -0000	1.43
@@ -1,22 +1,15 @@
-%define snaprel -patch1
+%define snaprel %{nil}
 Name: hdf5
-Version: 1.8.4.patch1
+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
-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
 
@@ -49,11 +42,8 @@ HDF5 static libraries.
 
 
 %prep
-#setup -q -n %{name}-%{version}%{?snaprel}
-%setup -q -n %{name}-1.8.4%{?snaprel}
-%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 {} +
 
 
@@ -158,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/*.settings
 %{_fmoddir}/*.mod
+%{_datadir}/hdf5_examples/
 
 %files static
 %defattr(-,root,root,-)
@@ -165,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	1 Mar 2010 16:11:38 -0000	1.15
+++ sources	21 Jun 2010 21:41:30 -0000	1.16
@@ -1 +1 @@
-b19f4dfbf654a2af3653c492fc1c7513  hdf5-1.8.4-patch1.tar.bz2
+a400fe6c1c5964a7224dc684225d415c  hdf5-1.8.5.tar.bz2


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


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