- Update to 1.7.3

- Upstream no longer ships license incompatible files
This commit is contained in:
Orion Poplawski 2013-10-20 20:44:51 -06:00
parent 1c1fa35389
commit 8a866fc34b
4 changed files with 9 additions and 43 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ openmpi-1.4.1-RH.tar.bz2
/openmpi-1.7-clean.tar.xz /openmpi-1.7-clean.tar.xz
/openmpi-1.7.1-clean.tar.xz /openmpi-1.7.1-clean.tar.xz
/openmpi-1.7.2-clean.tar.xz /openmpi-1.7.2-clean.tar.xz
/openmpi-1.7.3.tar.bz2

View File

@ -1,32 +0,0 @@
diff -up openmpi-1.7/configure.removed openmpi-1.7/configure
--- openmpi-1.7/configure.removed 2013-03-28 14:38:48.000000000 -0600
+++ openmpi-1.7/configure 2013-04-16 21:43:00.165986877 -0600
@@ -72177,9 +72177,6 @@ $as_echo "$compile_mode" >&6; }
# try to configure the component. pay no attention to
# --enable-dist, since we'll always have makefiles.
- ac_config_files="$ac_config_files opal/mca/backtrace/darwin/Makefile"
-
-
for ac_func in vm_read_overwrite
do :
ac_fn_c_check_func "$LINENO" "vm_read_overwrite" "ac_cv_func_vm_read_overwrite"
@@ -194246,7 +194243,6 @@ do
"opal/mca/backtrace/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/Makefile" ;;
"opal/mca/backtrace/printstack/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/printstack/Makefile" ;;
"opal/mca/backtrace/execinfo/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/execinfo/Makefile" ;;
- "opal/mca/backtrace/darwin/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/darwin/Makefile" ;;
"opal/mca/backtrace/none/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/backtrace/none/Makefile" ;;
"opal/mca/compress/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/compress/Makefile" ;;
"opal/mca/compress/gzip/Makefile") CONFIG_FILES="$CONFIG_FILES opal/mca/compress/gzip/Makefile" ;;
diff -up openmpi-1.7/Makefile.in.removed openmpi-1.7/Makefile.in
--- openmpi-1.7/Makefile.in.removed 2013-03-28 14:34:54.000000000 -0600
+++ openmpi-1.7/Makefile.in 2013-04-16 21:42:00.734597103 -0600
@@ -226,7 +226,6 @@ am__aclocal_m4_deps = $(top_srcdir)/ompi
$(top_srcdir)/opal/mca/memory/configure.m4 \
$(top_srcdir)/opal/mca/pstat/configure.m4 \
$(top_srcdir)/opal/mca/timer/configure.m4 \
- $(top_srcdir)/opal/mca/backtrace/darwin/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/none/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/printstack/configure.m4 \
$(top_srcdir)/opal/mca/backtrace/execinfo/configure.m4 \

View File

@ -18,23 +18,17 @@
#global _cc_name_suffix -gcc #global _cc_name_suffix -gcc
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 1.7.2 Version: 1.7.3
Release: 7%{?dist} Release: 1%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
Group: Development/Libraries Group: Development/Libraries
License: BSD, MIT and Romio License: BSD, MIT and Romio
URL: http://www.open-mpi.org/ URL: http://www.open-mpi.org/
# We can't use %{name} here because of _cc_name_suffix # We can't use %{name} here because of _cc_name_suffix
#Source0: http://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-%{version}.tar.bz2 Source0: http://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-%{version}.tar.bz2
# openmpi-%{version}-clean.tar.xz was generated by taking the upstream tarball
# and removing license-incompatible files:
# rm -r opal/mca/backtrace/darwin/MoreBacktrace
Source0: openmpi-%{version}-clean.tar.xz
Source1: openmpi.module.in Source1: openmpi.module.in
Source2: macros.openmpi Source2: macros.openmpi
# Patch to handle removed items
Patch0: openmpi-removed.patch
# Patch to use system ltdl for tests # Patch to use system ltdl for tests
Patch1: openmpi-ltdl.patch Patch1: openmpi-ltdl.patch
@ -115,7 +109,6 @@ Contains development headers and libraries for openmpi
%prep %prep
%setup -q -n openmpi-%{version} %setup -q -n openmpi-%{version}
%patch0 -p1 -b .removed
%patch1 -p1 -b .ltdl %patch1 -p1 -b .ltdl
# Make sure we don't use the local libltdl library # Make sure we don't use the local libltdl library
rm -r opal/libltdl rm -r opal/libltdl
@ -239,6 +232,10 @@ make check
%{_sysconfdir}/rpm/macros.%{namearch} %{_sysconfdir}/rpm/macros.%{namearch}
%changelog %changelog
* Sun Oct 20 2013 Orion Poplawski <orion@cora.nwra.com> 1.7.3-1
- Update to 1.7.3
- Upstream no longer ships license incompatible files
* Fri Aug 16 2013 Orion Poplawski <orion@cora.nwra.com> 1.7.2-7 * Fri Aug 16 2013 Orion Poplawski <orion@cora.nwra.com> 1.7.2-7
- Move orte* compiler wrappers to devel sub-package (bug #997330) - Move orte* compiler wrappers to devel sub-package (bug #997330)

View File

@ -1 +1 @@
fd5c58ece5cbce64038e0bc4fc340a6a openmpi-1.7.2-clean.tar.xz 7d0779f73c43eb1d098ad037d60649bc openmpi-1.7.3.tar.bz2