Author: glen Date: Tue Jan 8 23:24:14 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - make install re-entrant - move mans document to man7; rel 4
---- Files affected: SPECS: lam.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/lam.spec diff -u SPECS/lam.spec:1.38 SPECS/lam.spec:1.39 --- SPECS/lam.spec:1.38 Tue Dec 25 01:18:44 2007 +++ SPECS/lam.spec Wed Jan 9 00:24:08 2008 @@ -5,9 +5,8 @@ Summary(pt_BR.UTF-8): LAM MPI Name: lam Version: 7.1.3 -Release: 3 +Release: 4 Epoch: 2 -Vendor: LAM/MPI Team License: BSD Group: Development/Libraries Source0: http://www.lam-mpi.org/download/files/%{name}-%{version}.tar.bz2 @@ -91,6 +90,13 @@ %prep %setup -q +# Rename the ROMIO doc files so that we can install them in the same +# doc root later, and not overwrite LAM's doc files. +for file in README README_LAM COPYRIGHT; do + mv romio/$file romio/romio-$file +done +mv romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz + %build chmod -R u+w . touch config/lam_check_fd_setsize.m4 @@ -98,9 +104,9 @@ %{__aclocal} %{__autoconf} %{__automake} -for i in `find . -name config.sub`; do +for i in $(find -name config.sub); do cp -f /usr/share/automake/config.sub $i -done; +done %configure \ --with-pic \ @@ -116,19 +122,12 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_includedir}/mpi++.h -ln -sf mpi2c++/mpi++.h $RPM_BUILD_ROOT%{_includedir}/mpi++.h - -# Rename the ROMIO doc files so that we can install them in the same -# doc root later, and not overwrite LAM's doc files. - -for file in README README_LAM COPYRIGHT; do - mv romio/$file romio/romio-$file -done -mv romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz +ln -snf mpi2c++/mpi++.h $RPM_BUILD_ROOT%{_includedir}/mpi++.h install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -mv examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} + +mv $RPM_BUILD_ROOT%{_mandir}/man{s,7}/mpi.share* %clean rm -rf $RPM_BUILD_ROOT @@ -147,8 +146,6 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lam-ssi-crmpi-self-helpfile %attr(755,root,root) %{_bindir}/* %{_mandir}/man[1357]/* -# ??? -%{_mandir}/mans/mpi.share* %{_libdir}/liblam.a %{_libdir}/liblamf77mpi.a %{_libdir}/liblammpi++.a @@ -171,6 +168,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2008-01-08 23:24:08 glen +- make install re-entrant +- move mans document to man7; rel 4 + Revision 1.38 2007-12-25 00:18:44 qboosh - more verbose files @@ -248,15 +249,15 @@ - massive attack s/pld.org.pl/pld-linux.org/ Revision 1.14 2002/10/09 09:07:40 qboosh -- BR: libtool; new %%doc +- BR: libtool; new %doc Revision 1.13 2002/06/23 20:32:30 kloczek - perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/" Revision 1.12 2002/05/21 23:13:41 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ +- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" + s/^autoconf/\%\{__autoconf\}/" Revision 1.11 2002/05/13 10:16:43 qboosh - removed /etc dir from package; release 6 @@ -282,15 +283,15 @@ - cosmetics, pl description Revision 1.4 2002/01/18 21:17:22 adasi - -some fixes +- some fixes Revision 1.3 2002/01/18 19:24:58 adasi - - seems to be building correctly - - TODO: manuals in seperate package (it's HUGE) - - STBR +- seems to be building correctly +- TODO: manuals in seperate package (it's HUGE) +- STBR Revision 1.2 2002/01/18 18:51:31 adasi - - added libtoolize --copy --force as suggested by arekm +- added libtoolize --copy --force as suggested by arekm Revision 1.1 2002/01/18 18:34:59 adasi - Initial release ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lam.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
