Move orte* compiler wrappers to devel sub-package (bug #997330)

.gitignore

@@ -9,3 +9,4 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-1.6.3-clean.tar.xz
 /openmpi-1.6.4-clean.tar.bz2
 /openmpi-1.6.4-clean.tar.xz
+/openmpi-1.6.5-clean.tar.xz

openmpi.spec

@@ -18,8 +18,8 @@
 #global _cc_name_suffix -gcc
 
 Name:			openmpi%{?_cc_name_suffix}
-Version:		1.6.4
-Release:		2%{?dist}
+Version:		1.6.5
+Release:		3%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -174,7 +174,7 @@ mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix}
 # Remove extraneous wrapper link libraries (bug 814798)
 sed -i -e s/-ldl// -e s/-lhwloc// \
   %{buildroot}%{_libdir}/%{name}/bin/orte_wrapper_script \
-  %{buildroot}%{_libdir}/%{name}/share/%{name}/*-wrapper-data.txt
+  %{buildroot}%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt
 
 %check
 make check
@@ -196,13 +196,13 @@ make check
 %{_libdir}/%{name}/bin/ompi*
 #%{_libdir}/%{name}/bin/opal-*
 %{_libdir}/%{name}/bin/opari
-%{_libdir}/%{name}/bin/orte*
+%{_libdir}/%{name}/bin/orte[-dr_]*
 %{_libdir}/%{name}/bin/otf*
 %{_libdir}/%{name}/lib/*.so.*
 %{_mandir}/%{namearch}/man1/mpi[er]*
 %{_mandir}/%{namearch}/man1/ompi*
 #%{_mandir}/%{namearch}/man1/opal-*
-%{_mandir}/%{namearch}/man1/orte*
+%{_mandir}/%{namearch}/man1/orte[-dr_]*
 %{_mandir}/%{namearch}/man7/ompi*
 %{_mandir}/%{namearch}/man7/orte*
 %{_libdir}/%{name}/lib/openmpi/*
@@ -220,8 +220,9 @@ make check
 %dir %{_includedir}/%{namearch}
 %dir %{_libdir}/%{name}/share/vampirtrace
 %{_libdir}/%{name}/bin/mpi[cCf]*
-%{_libdir}/%{name}/bin/vt*
 %{_libdir}/%{name}/bin/opal_*
+%{_libdir}/%{name}/bin/orte[cCf]*
+%{_libdir}/%{name}/bin/vt*
 %{_includedir}/%{namearch}/*
 %{_libdir}/%{name}/lib/*.so
 %{_libdir}/%{name}/lib/lib*.a
@@ -237,6 +238,15 @@ make check
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Fri Aug 16 2013 Orion Poplawski <orion@cora.nwra.com> 1.6.5-3
+- Move orte* compiler wrappers to devel sub-package (bug #997330)
+
+* Fri Jul 26 2013 Orion Poplawski <orion@cora.nwra.com> 1.6.5-2
+- Fix build issue with _cc_name_suffix (bug #986664)
+
+* Thu Jul 11 2013 Orion Poplawski <orion@cora.nwra.com> 1.6.5-1
+- Update to 1.6.5
+
 * Sat Feb 23 2013 Orion Poplawski <orion@cora.nwra.com> 1.6.4-2
 - Exclude libopen-trace.* from requires
 

sources

@@ -1 +1 @@
-edee8f55e759294da58540d796a9fbd1  openmpi-1.6.4-clean.tar.xz
+522213b5a70f63cc2b8d6b71815a1360  openmpi-1.6.5-clean.tar.xz