Accepting request 108884 from devel:libraries:c_c++

fix to fix, add missing executable h5fc for suse > 11.4

This got broken in sr108856. Please also supersede sr108860 against Factory. (forwarded request 108882 from rudi_m)

OBS-URL: https://build.opensuse.org/request/show/108884
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=2

hdf5.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 12 11:57:39 UTC 2012 - sweet_f_a@gmx.de
+
+- install libhdf5.settings (bnc#751747)
+- move executables h5cc and h5c++ to the devel package 
+
 -------------------------------------------------------------------
 Sun Feb 19 04:46:42 UTC 2012 - ocefpaf@gmail.com
 

hdf5.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package hdf5 (Version 1.8.8)
+# spec file for package hdf5
 #
-# Copyright (c) 2009-2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,23 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define hdf5_libver 0
 %define libname libhdf5
 
-Name:          hdf5
-Version:       1.8.8
-Release:       0
-Summary:       A general purpose library and file format for storing scientific data
-License:       BSD-3-Clause
-Group:         Development/Libraries/Other
-URL:           http://www.hdfgroup.org/HDF5/
-Source0:       http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
-Source1:       h5comp
-Patch0:        hdf5-LD_LIBRARY_PATH.patch
-Patch1:        hdf5-non_void_return.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-build
-BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-fortran, gcc-c++
-BuildRequires: fdupes
+Name:           hdf5
+Version:        1.8.8
+Release:        0
+Summary:        A general purpose library and file format for storing scientific data
+License:        BSD-3-Clause
+Group:          Development/Libraries/Other
+Url:            http://www.hdfgroup.org/HDF5/
+Source0:        http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
+Source1:        h5comp
+Patch0:         hdf5-LD_LIBRARY_PATH.patch
+Patch1:         hdf5-non_void_return.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  gcc-c++ gcc-fortran krb5-devel openssl-devel zlib-devel
+BuildRequires:  fdupes
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.
@@ -136,19 +137,13 @@ make %{?_smp_mflags}
 
 %install
 %makeinstall docdir=%{buildroot}%{_docdir}
-rm -rf %{buildroot}/%{_libdir}/*.la %{buildroot}/%{_libdir}/*.settings
+rm -rf %{buildroot}/%{_libdir}/*.la
 
 find %{buildroot}%{_datadir}/hdf5_examples -type f \
                  | grep -v ".sh$" | xargs chmod 644
 
 %fdupes -s %{buildroot}/%{_datadir}
 
-%if 0%{?suse_version} > 1140
-  binaries="h5c++ h5cc h5fc"
-%else
-  binaries="h5c++ h5cc"
-%endif
-
 # rpm macro for version checking
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
@@ -178,7 +173,22 @@ make check
 %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt
 %doc release_docs/HISTORY-1_0-1_8_0_rc3.txt release_docs/HISTORY-1_8.txt
 %doc release_docs/RELEASE.txt
-%{_bindir}/*
+%{_bindir}/gif2h5
+%{_bindir}/h52gif
+%{_bindir}/h5copy
+%{_bindir}/h5debug
+%{_bindir}/h5diff
+%{_bindir}/h5dump
+%{_bindir}/h5import
+%{_bindir}/h5jam
+%{_bindir}/h5ls
+%{_bindir}/h5mkgrp
+%{_bindir}/h5perf_serial
+%{_bindir}/h5redeploy
+%{_bindir}/h5repack
+%{_bindir}/h5repart
+%{_bindir}/h5stat
+%{_bindir}/h5unjam
 
 %files -n %{libname}-%{hdf5_libver}
 %defattr(0755,root,root)
@@ -188,7 +198,6 @@ make check
 %{_libdir}/libhdf5_fortran.so.*
 %endif
 
-
 %files -n libhdf5_hl%{hdf5_libver}
 %defattr(0755,root,root)
 %{_libdir}/libhdf5_hl.so.*
@@ -200,8 +209,14 @@ make check
 %files devel
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/rpm/macros.hdf5
+%{_bindir}/h5c++
+%{_bindir}/h5cc
+%if 0%{?suse_version} > 1140
+%{_bindir}/h5fc
+%endif
 %{_includedir}/*.h
 %{_libdir}/*.so
+%{_libdir}/*.settings
 %if 0%{?suse_version} > 1140
 %{_includedir}/*.mod
 %endif