[votca-csg/f14] Update to 1.2.1.

Jussi Lehtola jussilehtola at fedoraproject.org
Thu Aug 25 19:55:50 UTC 2011


commit d23949a5baab7fe7d9adb494b1c59991555b9716
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Thu Aug 25 22:55:38 2011 +0300

    Update to 1.2.1.

 sources        |    2 +-
 votca-csg.spec |   26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/sources b/sources
index f21fd26..c9b2b7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-530b2e1a7f70b89ee3224cd9d02d73a9  votca-csg-1.1.tar.gz
+5ff7ceba0507c992563a9315f0000f79  votca-csg-1.2.1.tar.gz
diff --git a/votca-csg.spec b/votca-csg.spec
index d585fec..28415ad 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,5 +1,5 @@
 Name:		votca-csg
-Version:	1.1
+Version:	1.2.1
 Release:	1%{?dist}
 Summary:	VOTCA coarse-graining engine
 Group:		Applications/Engineering
@@ -8,6 +8,7 @@ URL:		http://www.votca.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://votca.googlecode.com/files/%{name}-%{version}.tar.gz
 
+BuildRequires:	cmake
 BuildRequires:	doxygen
 BuildRequires:	gromacs-devel
 BuildRequires:	votca-tools-devel = %{version}
@@ -82,17 +83,15 @@ engine.
 %setup -q
 
 %build
-%configure --disable-static --disable-la-files --disable-rc-files \
-	--with-libgmx=gmx_d
-# Get rid of rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-# Make binaries
+mkdir %{_target_platform}
+cd %{_target_platform}
+# Get rid of -O3 in default flags
+%{cmake} .. -DLIB=%{_lib} -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG"
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+make -C %{_target_platform} install DESTDIR=%{buildroot} INSTALL="install -p"
 # Install bash completion file
 install -D -p -m 644 scripts/csg-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/votca
 
@@ -104,7 +103,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG NOTICE README
+%doc NOTICE README
 %{_bindir}/csg_*
 %{_bindir}/multi_g_*
 %{_mandir}/man1/csg_*.1.*
@@ -132,6 +131,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 25 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1.
+
+* Sat Jul 23 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-3
+- Bump spec due to new boost.
+
+* Thu Apr 07 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-2
+- Bump spec due to boost upgrade.
+
 * Mon Feb 21 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
 - Update to 1.1.
 


More information about the scm-commits mailing list