Hello community, here is the log from the commit of package gromacs for openSUSE:Factory checked in at 2017-05-16 14:43:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gromacs (Old) and /work/SRC/openSUSE:Factory/.gromacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gromacs" Tue May 16 14:43:27 2017 rev:33 rq:494476 version:2016.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gromacs/gromacs.changes 2017-03-16 09:51:37.365046526 +0100 +++ /work/SRC/openSUSE:Factory/.gromacs.new/gromacs.changes 2017-05-16 14:44:36.539734203 +0200 @@ -1,0 +2,6 @@ +Mon May 8 16:28:38 UTC 2017 - [email protected] + +- __builddir is not overwritable on SLE-12, so use subdirs +- disable test on s390x (too slow) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gromacs.spec ++++++ --- /var/tmp/diff_new_pack.7IwuO3/_old 2017-05-16 14:44:39.723286884 +0200 +++ /var/tmp/diff_new_pack.7IwuO3/_new 2017-05-16 14:44:39.727286321 +0200 @@ -126,7 +126,8 @@ %else %define acce None %endif -%define __builddir nompi +mkdir nompi +cd nompi # note about rpath # gromacs' cmake has too much rpath auto-magic, just # force to skip it (CMAKE_SKIP_RPATH=1) and use @@ -144,12 +145,13 @@ -DGMX_SYMLINK_OLD_BINARY_NAMES=OFF \ -DGMX_OPENMP=ON \ -DGMX_EXTERNAL_TINYXML2=ON \ - -DREGRESSIONTEST_PATH="$PWD/../regressiontests-%{version}" \ - -DGMX_LIB_INSTALL_DIR=%{_lib} + -DREGRESSIONTEST_PATH="$PWD/../../regressiontests-%{version}" \ + -DGMX_LIB_INSTALL_DIR=%{_lib} ../../ make %{?_smp_mflags} -cd .. -%define __builddir openmpi +cd ../.. +mkdir openmpi +cd openmpi %{cmake} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ @@ -164,13 +166,13 @@ -DGMX_SYMLINK_OLD_BINARY_NAMES=OFF \ -DGMX_OPENMP=ON \ -DGMX_EXTERNAL_TINYXML2=ON \ - -DREGRESSIONTEST_PATH="$PWD/../regressiontests-%{version}" \ - -DGMX_LIB_INSTALL_DIR=%{_lib} + -DREGRESSIONTEST_PATH="$PWD/../../regressiontests-%{version}" \ + -DGMX_LIB_INSTALL_DIR=%{_lib} ../../ make %{?_smp_mflags} %install -make -C nompi install DESTDIR=%{buildroot} -make -C openmpi install DESTDIR=%{buildroot} +make -C nompi/build install DESTDIR=%{buildroot} +make -C openmpi/build install DESTDIR=%{buildroot} %fdupes %{buildroot}%{_prefix} #no need when installed in /usr @@ -184,8 +186,11 @@ cp %{S:1} %{buildroot}%{_datadir}/gromacs %check -LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make -C nompi %{?_smp_mflags} check -LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make -C openmpi %{?_smp_mflags} check +#s390x is too slow for tests +%ifnarch s390x +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make -C nompi/build %{?_smp_mflags} check +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make -C openmpi/build %{?_smp_mflags} check +%endif %post -n libgromacs2 -p /sbin/ldconfig %postun -n libgromacs2 -p /sbin/ldconfig
