Attachment 147801 Details for Bug 191436 – Patch to update to 1.1.4

[patch] Patch to update to 1.1.4

spec.patch (text/plain), 6.72 KB, created by Orion Poplawski on 2007-02-09 20:02:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Orion Poplawski

Created: 2007-02-09 20:02:10 UTC

Size: 6.72 KB

patch

obsolete

>Index: openmpi.spec
>===================================================================
>RCS file: /cvs/dist/rpms/openmpi/devel/openmpi.spec,v
>retrieving revision 1.20
>diff -u -r1.20 openmpi.spec
>--- openmpi.spec	6 Feb 2007 10:31:27 -0000	1.20
>+++ openmpi.spec	9 Feb 2007 20:01:29 -0000
>@@ -1,12 +1,12 @@
> Name:           openmpi
>-Version:        1.1
>-Release:        8%{?dist}
>+Version:        1.1.4
>+Release:        1%{?dist}
> Summary:        Open Message Passing Interface
> 
> Group:          Development/Libraries
> License:        BSD
> URL:            http://www.open-mpi.org/
>-Source0:       	http://www.open-mpi.org/software/ompi/v1.1/downloads/%{name}-%{version}.tar.bz2
>+Source0:       	http://www.open-mpi.org/software/ompi/v1.1/downloads/openmpi-%{version}.tar.bz2
> Source1:	openmpi.pc.in
> Source2:	openmpi.module.in
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>@@ -62,7 +62,7 @@
> %endif
> 
> %prep
>-%setup -q
>+%setup -q -n openmpi-%{version}
> %ifarch x86_64
> XCFLAGS="$RPM_OPT_FLAGS -fPIC"
> XCXXFLAGS="$RPM_OPT_FLAGS -fPIC"
>@@ -82,7 +82,7 @@
> %configure \
> 	--includedir=%{_includedir}/%{name} \
> 	--libdir=%{_libdir}/%{name} \
>-	--datadir=%{_datadir}/%{name}/help%{mode} \
>+	--datadir=%{_datadir}/%{name}-%{mode}/help \
> 	LDFLAGS='-Wl,-z,noexecstack' \
> 	CFLAGS="$CFLAGS $XCFLAGS" \
> 	CXXFLAGS="$CFLAGS $XCFLAGS" \
>@@ -113,11 +113,27 @@
> # But, opal_wrapper needs to be called by a name that denotes the compiler
> # type in order to work, so in order to leave it functional even when it isn't
> # the currently selected system wide default via the alternatives program,
>-# make the proper symlinks from %{_datadir}/%{name}/bin to the wrapper
>-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/bin%{mode}
>+# make the proper symlinks from %{_datadir}/%{name}-%{mode}/bin to the wrapper
>+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/bin
> for i in mpicc mpic++ mpicxx mpiCC mpif77 mpif90 opalcc opalc++ opalCC ortecc ortec++ orteCC; do
>   ln -s %{_bindir}/opal_wrapper-%{mode} \
>-  	${RPM_BUILD_ROOT}%{_datadir}/%{name}/bin%{mode}/$i
>+  	${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/bin/$i
>+done
>+# Make links for the runtime binaries and libs so orterun --prefix works
>+for i in orted orterun ompi_info; do
>+  ln -s %{_bindir}/$i ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/bin/$i
>+done
>+for i in mpiexec mpirun; do
>+  ln -s orterun ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/bin/$i
>+done
>+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/%{_lib}/openmpi
>+for i in ${RPM_BUILD_ROOT}%{_libdir}/%{name}/*.so.*; do
>+  i=`basename $i`
>+  ln -s %{_libdir}/%{name}/$i ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/%{_lib}/$i
>+done
>+for i in ${RPM_BUILD_ROOT}%{_libdir}/%{name}/openmpi/*.so; do
>+  i=`basename $i`
>+  ln -s %{_libdir}/%{name}/openmpi/$i ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/%{_lib}/openmpi/$i
> done
> # The fortran include file differs between 32/64bit environments, so make
> # two copies
>@@ -125,24 +141,24 @@
> mv ${RPM_BUILD_ROOT}%{_includedir}/%{name}/{mpif-config.h,%{mode}}
> # and have the wrapper include the right one by using the wrapper-data.txt
> # files for the fortran modes to signal the extra include dir
>-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}/help%{mode}/openmpi/mpif{77,90}-wrapper-data.txt; do
>+for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/help/openmpi/mpif{77,90}-wrapper-data.txt; do
>   sed -e 's#extra_includes=#extra_includes='%{mode}' #' < $i > $i.out
>   mv $i.out $i
> done
> # and we also need to force the compile mode via the wrapper-data.txt files
> # (except on ia64 where the -m64 flag is not allowed by gcc)
> %ifnarch ia64
>-for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}/help%{mode}/openmpi/*wrapper-data.txt; do
>+for i in ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{mode}/help/openmpi/*wrapper-data.txt; do
>   sed -e 's#compiler_flags=#compiler_flags=-m'%{mode}' #' < $i > $i.out
>   mv $i.out $i
> done
> %endif
> 
>-echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf
>+echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/openmpi.ld.conf
> # Make the pkgconfig files
> mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig;
> sed 's#@NAME@#'%{name}'#;s#@VERSION@#'%{version}'#;s#@LIBDIR@#'%{_libdir}'#;s#@INCLUDEDIR@#'%{_includedir}'#;s#@MODE@#'%{mode}'#' < %SOURCE1 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}.pc;
>-sed 's#@DATADIR@#'%{_datadir}'#;s#@NAME@#'%{name}'#;s#@LIBDIR@#'%{_libdir}'#;s#@INCLUDEDIR@#'%{_includedir}'#;s#@MODE@#'%{mode}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/%{name}.module
>+sed 's#@DATADIR@#'%{_datadir}'#;s#@NAME@#'%{name}-%{mode}'#;s#@LIBDIR@#'%{_libdir}'#;s#@INCLUDEDIR@#'%{_includedir}'#;s#@MODE@#'%{mode}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}-%{mode}/%{name}.module
> 
> 
> %clean
>@@ -190,40 +206,52 @@
> %defattr(-,root,root,-)
> %doc LICENSE README
> %config(noreplace) %{_sysconfdir}/openmpi-*
>-%{_bindir}/orteconsole
> %{_bindir}/orted
>-%{_bindir}/orteprobe
> %{_bindir}/orterun
> %{_bindir}/ompi_info
>-%{_bindir}/openmpi
> %{_mandir}
>-%{_datadir}/%{name}
>-%exclude %{_datadir}/%{name}/bin%{mode}
>-%exclude %{_datadir}/%{name}/help%{mode}/openmpi/*-wrapper-data.txt
>+%{_datadir}/%{name}-%{mode}
>+%exclude %{_datadir}/%{name}-%{mode}/bin/mpi[cCf]*
>+%exclude %{_datadir}/%{name}-%{mode}/bin/opal*
>+%exclude %{_datadir}/%{name}-%{mode}/bin/orte??*
>+%exclude %{_datadir}/%{name}-%{mode}/help/openmpi/*-wrapper-data.txt
>+%exclude %{_datadir}/%{name}-%{mode}/%{_lib}
> 
> %files libs
> %dir %{_libdir}/%{name}
>-%dir %{_libdir}/%{name}/%{name}
>+%dir %{_libdir}/%{name}/openmpi
> %{_libdir}/%{name}/*.so.*
>-%{_libdir}/%{name}/%{name}/*.so
>+%{_libdir}/%{name}/openmpi/*.so
> %{_libdir}/%{name}/*.conf
>+%{_datadir}/%{name}-%{mode}/%{_lib}
> 
> %files devel
> %defattr(-,root,root,-)
> %{_bindir}/opal_wrapper-%{mode}
> %dir %{_includedir}/%{name}
>-%{_datadir}/%{name}/bin%{mode}
>-%{_datadir}/%{name}/help%{mode}/openmpi/*-wrapper-data.txt
>+%{_datadir}/%{name}-%{mode}/bin/mpi[cCf]*
>+%{_datadir}/%{name}-%{mode}/bin/opal*
>+%{_datadir}/%{name}-%{mode}/bin/orte??*
>+%{_datadir}/%{name}-%{mode}/help/openmpi/*-wrapper-data.txt
> %{_includedir}/%{name}/*
>-%{_libdir}/%{name}/*.so
> %{_libdir}/%{name}/*.a
>+%{_libdir}/%{name}/*.so
> %{_libdir}/%{name}/*.la
>-%{_libdir}/%{name}/%{name}/*.la
>+%{_libdir}/%{name}/openmpi/*.la
> %{_libdir}/pkgconfig/%{name}.pc
> %{_libdir}/%{name}/*.mod
> 
> 
> %changelog
>+* Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> - 1.1.4-1
>+- Update to 1.1.4
>+- Change %%{name} to openmpi where appropriate
>+- Change install to /usr/share/%%{name}-%%{mode}/bin from
>+  /usr/share/%%{name}/bin%%{mode} for cleaner separation and to support
>+  orterun --prefix
>+- Make links for the runtime binaries and libs so orterun --prefix works
>+- Move development wrappers into -devel
>+
> * Tue Feb 06 2007 Florian La Roche <laroche@redhat.com> - 1.1-8
> - also add requires for sub-packages for "alternatives"
>

Actions: View | Diff

Attachments on bug 191436: 147801 | 159103 | 160036 | 160147