rpms/mpich2/devel .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 mpich2.spec, 1.4, 1.5 sources, 1.3, 1.4
Deji Akingunola
deji at fedoraproject.org
Mon May 18 23:15:07 UTC 2009
Author: deji
Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19762/devel
Modified Files:
.cvsignore import.log mpich2.spec sources
Log Message:
Update to 1.1rc1 and clean up spec file to conform to 'using alternatives guildeline'
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 19 Mar 2009 01:42:35 -0000 1.3
+++ .cvsignore 18 May 2009 23:14:36 -0000 1.4
@@ -1 +1 @@
-mpich2-1.1b1.tar.gz
+mpich2-1.1rc1.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 9 Mar 2009 12:48:04 -0000 1.1
+++ import.log 18 May 2009 23:14:36 -0000 1.2
@@ -1 +1,2 @@
mpich2-1_0_8-2_fc10:HEAD:mpich2-1.0.8-2.fc10.src.rpm:1236602656
+mpich2-1_1-0_3_rc1_fc11:HEAD:mpich2-1.1-0.3.rc1.fc11.src.rpm:1242688369
Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mpich2.spec 30 Mar 2009 03:22:14 -0000 1.4
+++ mpich2.spec 18 May 2009 23:14:36 -0000 1.5
@@ -1,11 +1,11 @@
Summary: A high-performance implementation of MPI
Name: mpich2
Version: 1.1
-Release: 0.2.b1%{?dist}
+Release: 0.3.rc1%{?dist}
License: MIT
Group: Development/Libraries
URL: http://www.mcs.anl.gov/research/projects/mpich2
-Source: http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}b1/src/%{name}-%{version}b1.tar.gz
+Source: http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}rc1/src/%{name}-%{version}rc1.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel, e2fsprogs-devel
BuildRequires: java-devel-openjdk, gcc-gfortran
@@ -53,36 +53,37 @@ Contains the arch dependent libraries an
# We only compile with gcc, but other people may want other compilers.
# Set the compiler here.
-%{!?opt_cc: %define opt_cc gcc}
-%{!?opt_fc: %define opt_fc gfortran}
+%{!?opt_cc: %global opt_cc gcc}
+%{!?opt_fc: %global opt_fc gfortran}
# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
# so uncomment and undefine to NOT use
-%{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}}
-%{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}}
+%{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
+%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
%ifarch %{ix86} x86_64
-%define selected_channels ch3:nemesis
+%global selected_channels ch3:nemesis
%else
-%define selected_channels ch3:sock
+%global selected_channels ch3:sock
%endif
%ifarch x86_64 ia64 ppc64 s390x sparc64
-%define mode 64
-%define priority 41
+%global mode 64
+%global priority 41
%else
-%define mode 32
-%define priority 40
+%global mode 32
+%global priority 40
%endif
%ifarch x86_64
-%define XFLAGS -fPIC
+%global XFLAGS -fPIC
%endif
%prep
-%setup -q -n %{name}-%{version}b1
+%setup -q -n %{name}-%{version}rc1
%configure \
--enable-sharedlibs=gcc \
+ --enable-threads \
--with-device=%{selected_channels} \
--sysconfdir=%{_sysconfdir}/%{name}-%{mode} \
--includedir=%{_includedir}/%{name} \
@@ -91,7 +92,7 @@ Contains the arch dependent libraries an
--docdir=%{_docdir}/%{name}-%{version} \
--htmldir=%{_docdir}/%{name}-%{version}/www \
--with-java=%{_sysconfdir}/alternatives/java_sdk \
- F90=%{opt_fc} \
+ F90=%{opt_fc} \
F77=%{opt_fc} \
CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}" \
CXXFLAGS="%{optflags} %{?XFLAGS}" \
@@ -112,10 +113,14 @@ rm -f %{buildroot}%{_bindir}/{mpiexec,mp
mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
pushd %{buildroot}%{_bindir}/
ln -s mpiexec.py mpdrun
+touch mpiexec
+touch mpirun
popd
for b in mpicxx mpicc mpif77 mpif90; do
mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
+ touch %{buildroot}%{_bindir}/$b;
mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1;
+ touch %{buildroot}%{_mandir}/man1/$b.1;
done
## Setup the executables for 'environment module'
@@ -227,16 +232,22 @@ fi
%dir %{_datadir}/%{name}/bin%{mode}
%{_datadir}/%{name}/bin%{mode}/mpiexec
%{_datadir}/%{name}/bin%{mode}/mpirun
-%exclude %{_bindir}/mp%{mode}-mpicc
-%exclude %{_bindir}/mp%{mode}-mpicxx
-%exclude %{_bindir}/mp%{mode}-mpif90
-%exclude %{_bindir}/mp%{mode}-mpif77
+%exclude %{_bindir}/mpiexec
+%exclude %{_bindir}/mpirun
+%exclude %{_bindir}/*mpicc
+%exclude %{_bindir}/*mpicxx
+%exclude %{_bindir}/*mpif90
+%exclude %{_bindir}/*mpif77
%doc %{_docdir}/%{name}-%{version}/
-%{_mandir}/man1/*
+%{_mandir}/man1/mp-*.1.gz
%if 0%{?fedora} < 11
%exclude %{_bindir}/mp*.pyc
%exclude %{_bindir}/mp*.pyo
%endif
+%ghost %{_bindir}/mpiexec
+%ghost %{_bindir}/mpirun
+%ghost %{_mandir}/man1/mpi*.1.gz
+%ghost %{_mandir}/man1/MPI.1.gz
%files libs
%defattr(-,root,root,-)
@@ -248,10 +259,11 @@ fi
%files devel
%defattr(-,root,root,-)
-%{_bindir}/mp%{mode}-mpicc
-%{_bindir}/mp%{mode}-mpicxx
-%{_bindir}/mp%{mode}-mpif90
-%{_bindir}/mp%{mode}-mpif77
+%{_bindir}/mp%{mode}*
+%ghost %{_bindir}/mpicc
+%ghost %{_bindir}/mpicxx
+%ghost %{_bindir}/mpif90
+%ghost %{_bindir}/mpif77
%{_includedir}/*
%{_libdir}/%{name}/*.a
%{_libdir}/%{name}/*.so
@@ -268,6 +280,11 @@ fi
%doc README.testing README.romio README.developer
%changelog
+* Mon May 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.3.rc1
+- Update to 1.1rc1
+- Update spec to follow the proposed packaging guildelines wrt using alternatives
+- Also change to use the global macro instead of define.
+
* Sun Mar 29 2009 Deji Akingunola <dakingun at gmail.com> - 1.1-0.2.b1
- Specifically build with openjdk Java, so Jumpshot works (Anthony Chan)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 19 Mar 2009 01:42:35 -0000 1.3
+++ sources 18 May 2009 23:14:36 -0000 1.4
@@ -1 +1 @@
-09661f584a89ec3aa5ea6ee8cc0feb0b mpich2-1.1b1.tar.gz
+7e2c7d5a929287e9272ed528170a1071 mpich2-1.1rc1.tar.gz
More information about the scm-commits
mailing list