rpms/towhee/EL-5 sources,1.2,1.3 towhee.spec,1.4,1.5
Jussi Lehtola
jussilehtola at fedoraproject.org
Thu Jul 16 16:42:08 UTC 2009
Author: jussilehtola
Update of /cvs/pkgs/rpms/towhee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4975/EL-5
Modified Files:
sources towhee.spec
Log Message:
Update to 6.2.6.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 27 May 2009 12:26:54 -0000 1.2
+++ sources 16 Jul 2009 16:41:38 -0000 1.3
@@ -1 +1 @@
-72475a7af55bd93376c51cd081be2e40 towhee-6.2.3.tar.gz
+1ea66130962bd79d24b6671b285fdef4 towhee-6.2.6.tar.gz
Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/EL-5/towhee.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- towhee.spec 27 May 2009 15:52:06 -0000 1.4
+++ towhee.spec 16 Jul 2009 16:41:38 -0000 1.5
@@ -1,6 +1,6 @@
Name: towhee
-Version: 6.2.3
-Release: 5%{?dist}
+Version: 6.2.6
+Release: 1%{?dist}
Summary: A Monte Carlo molecular simulation code
Group: Applications/Engineering
License: GPLv2+
@@ -9,14 +9,10 @@ Source0: http://downloads.sourceforge.ne
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Provides: towhee-executable = %{version}-%{release}
Requires: towhee-common = %{version}-%{release}
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
BuildRequires: gcc-gfortran
-%if 0%{?fedora} > 11
-BuildRequires: openmpi
-%else
BuildRequires: openmpi-devel
-%endif
# Check for mpi-selector or environment-modules
%global selector 0
@@ -54,6 +50,9 @@ phases.
This package contains binaries for serial operation and the utilities.
+N.B. Due to some general names the utilities have a towhee- prefix, e.g.
+analyse_movie is now towhee-analyse_movie.
+
%package mpi
Summary: Towhee, MPI version
@@ -112,17 +111,34 @@ for file in Examples/*/towhee_input; do
done
%build
+## Build the main binaries
# Use gfortran, not g77.
export F77=gfortran
+
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=502883
+%ifarch ppc64
+export CFLAGS="%{optflags} -mminimal-toc"
+export CXXFLAGS="%{optflags} -mminimal-toc"
+export FFLAGS="%{optflags} -mminimal-toc"
+%else
+export FFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
+%endif
+
## Build serial version
mkdir nompi
cd nompi
ln -s ../configure .
%configure
make %{?_smp_mflags}
+
+# Utilities
+cd Utils
+make %{?_smp_mflags}
cd ..
-# FIXME: Build utilities too
+cd ..
## Build parallel version
# Load MPI enviroment
@@ -151,8 +167,9 @@ cd ..
%install
rm -rf %{buildroot}
# Install binaries
-make -C nompi install DESTDIR=%{buildroot}
-make -C mpi install DESTDIR=%{buildroot}
+make -C mpi install DESTDIR=%{buildroot} INSTALL="install -p"
+make -C nompi install DESTDIR=%{buildroot} INSTALL="install -p"
+
# Install force fields
find ForceFields/ -name "Makefile*" -exec rm {} \;
mkdir -p %{buildroot}%{_datadir}/%{name}
@@ -163,6 +180,13 @@ find Manual/ -name "Makefile*" -exec rm
find Examples/ -name "Makefile*" -exec rm {} \;
find Examples/ -type f -exec chmod 644 {} \;
+# Rename utilities
+for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}{,-mpi}; do
+ mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/towhee-$bin
+done
+# Remove mpi versions of the utilities
+rm %{buildroot}%{_bindir}/towhee-*-mpi
+
%clean
rm -rf %{buildroot}
@@ -170,15 +194,14 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc license.gpl
-%{_bindir}/fitcoex
%{_bindir}/forcefield
%{_bindir}/towhee
-# FIXME: add utils here
+# Utils
+%{_bindir}/towhee-*
%files mpi
%defattr(-,root,root,-)
%doc license.gpl
-%{_bindir}/fitcoex-mpi
%{_bindir}/forcefield-mpi
%{_bindir}/towhee-mpi
@@ -196,6 +219,15 @@ rm -rf %{buildroot}
%doc Examples/*
%changelog
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.6-1
+- Update to upstream 6.2.6.
+
+* Wed Jun 17 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.5-1
+- Update to upstream 6.2.5, which fixes the naming bug of fitcoex in 6.2.4.
+
+* Tue Jun 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.4-1
+- Update to upstream 6.2.4, which adds utilities.
+
* Wed May 27 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.3-5
- ExcludeArch: ppc64 which is not working due to operand out of range error.
See RHBZ #502883.
More information about the fedora-extras-commits
mailing list