From e532d0c896b5d687fec7931f737f31f59745f46681258880c6135d8376417a2f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 29 Sep 2012 13:32:19 +0000 Subject: [PATCH] Accepting request 136159 from devel:libraries:c_c++ - make sure to install the examples from non-parallel build (forwarded request 136098 from rudi_m) OBS-URL: https://build.opensuse.org/request/show/136159 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=8 --- hdf5.changes | 5 +++++ hdf5.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hdf5.changes b/hdf5.changes index c33982b..2d805fd 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 26 13:17:45 UTC 2012 - sweet_f_a@gmx.de + +- make sure to install the examples from non-parallel build + ------------------------------------------------------------------- Mon Sep 24 12:29:04 UTC 2012 - sweet_f_a@gmx.de diff --git a/hdf5.spec b/hdf5.spec index b35dfad..26a77b0 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -312,6 +312,7 @@ export LD_LIBRARY_PATH="%{_libdir}/mpi/gcc/$mpi/%_lib" %configure \ --docdir=%{_docdir}/%{name} \ --prefix=%{_libdir}/mpi/gcc/$mpi \ + --exec-prefix=%{_libdir}/mpi/gcc/$mpi \ --bindir=%{_libdir}/mpi/gcc/$mpi/bin \ --libdir=%{_libdir}/mpi/gcc/$mpi/%_lib \ --datadir=%{_libdir}/mpi/gcc/$mpi/share \ @@ -330,13 +331,17 @@ cd .. done %install -for build_dir in build %_mpi; do +# install serial and parallel builds, (the serial one will win in case of +# duplicate files) +for build_dir in %_mpi build; do make install DESTDIR="%buildroot" -C "$build_dir" done find "%buildroot/%_libdir" -type f -name "*.la" -delete find %{buildroot}%{_datadir}/hdf5_examples -type f \ | grep -v ".sh$" | xargs chmod 644 +# delete examples from parallel builds +rm -rf %{buildroot}%{_libdir}/mpi/gcc/*/share/hdf5_examples %if 0%{?suse_version} >= 1110 %fdupes -s %{buildroot}/%{_datadir} %endif