rpms/hdf5/FC-6 hdf5-1.6.5-sort.patch,NONE,1.1 hdf5.spec,1.11,1.12

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/hdf5/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1035/FC-6

Modified Files:
	hdf5.spec 
Added Files:
	hdf5-1.6.5-sort.patch 
Log Message:
Sync from devel


hdf5-1.6.5-sort.patch:

--- NEW FILE hdf5-1.6.5-sort.patch ---
--- hdf5-1.6.5/bin/ltmain.sh.sort	2007-03-02 16:20:05.000000000 -0700
+++ hdf5-1.6.5/bin/ltmain.sh	2007-03-02 16:20:12.000000000 -0700
@@ -3329,7 +3329,7 @@
 	    fi
 
 	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+	    if grep -v "^: " < "$nlist" | sort -k 2 | uniq > "$nlist"S; then
 	      :
 	    else
 	      grep -v "^: " < "$nlist" > "$nlist"S


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/FC-6/hdf5.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hdf5.spec	30 Aug 2006 02:53:01 -0000	1.11
+++ hdf5.spec	20 Apr 2007 22:51:43 -0000	1.12
@@ -1,10 +1,10 @@
 Name: hdf5
 Version: 1.6.5
-Release: 6%{?dist}
+Release: 7%{?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/HDF5/
+URL: http://www.hdfgroup.org/HDF5/
 Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/%{name}-%{version}.tar.gz
 Patch0: hdf5-1.6.4-gcc4.patch
 Patch1: hdf5-1.6.4-destdir.patch
@@ -14,6 +14,7 @@
 Patch5: hdf5-1.6.4-ppc.patch
 Patch6: hdf5-1.6.5-flags.patch
 Patch7: hdf5-1.6.5-x86_64.patch
+Patch8: hdf5-1.6.5-sort.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -44,6 +45,7 @@
 %patch5 -p1
 %patch6 -p1 -b .flags
 %patch7 -p1 -b .x86_64
+%patch8 -p1 -b .sort
 
 %build
 %configure --with-ssl --enable-cxx --enable-fortran \
@@ -53,9 +55,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 find doc/html -type f | xargs chmod -x
-#find doc/html -name '*.sh*' | xargs chmod +x
-find doc/html -name Dependencies | xargs rm
 %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
+find doc/html -name Dependencies -o -name Makefile\* | xargs rm
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
 # Don't instal h5perf until h5test.so.0 issues is sorted out
 rm $RPM_BUILD_ROOT/%{_bindir}/h5perf
@@ -93,13 +94,20 @@
 %{_bindir}/h5cc
 %{_bindir}/h5fc
 %{_bindir}/h5redeploy
-%{_docdir}/%{name}/examples/
+%{_docdir}/%{name}/
 %{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/*.mod
 
 %changelog
+* Mon Feb 12 2007 Orion Poplawski <orion at cora.nwra.com> 1.6.5-7
+- New project URL
+- Add patch to use POSIX sort key option
+- Remove useless and multilib conflicting Makefiles from html docs
+  (bug #228365)
+- Make hdf5-devel own %{_docdir}/%{name}
+
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-6
 - Rebuild for FC6