commit cmake for openSUSE:Factory
Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-08-20 17:51:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2014-08-13 08:48:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2014-08-20 17:51:33.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 18 08:20:28 UTC 2014 - tchvatal@suse.com + +- Mark macros as %config +- use curl-devel to build with as the internal libcurl is broken + with https bnc#892256 +- Run tests to avoid such bugs in future +- Provide %ctest macro for testing to avoid people having to + remember all the arguments + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.eyoQya/_old 2014-08-20 17:51:34.000000000 +0200 +++ /var/tmp/diff_new_pack.eyoQya/_new 2014-08-20 17:51:34.000000000 +0200 @@ -29,6 +29,7 @@ Patch2: cmake-fix-ruby-test.patch #PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch Patch3: cmake-ppc64le-jni.patch +BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel @@ -59,7 +60,6 @@ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ --system-libs \ - --no-system-curl \ %if 0%{?suse_version} <= 1110 --no-system-libarchive \ %endif @@ -82,9 +82,17 @@ %fdupes %{buildroot}%{_datadir}/cmake +%check +# Excluded tests: +# TestUpload: uses internet connection +# SimpleInstall: seems to fail due to RPATH strictness +# if any other app installs then this test is bogus +./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \ + -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)" + %files %defattr(-,root,root) -%{_sysconfdir}/rpm/macros.cmake +%config %{_sysconfdir}/rpm/macros.cmake %{_bindir}/cpack %{_bindir}/cmake %{_bindir}/ctest ++++++ cmake.macros ++++++ --- /var/tmp/diff_new_pack.eyoQya/_old 2014-08-20 17:51:34.000000000 +0200 +++ /var/tmp/diff_new_pack.eyoQya/_new 2014-08-20 17:51:34.000000000 +0200 @@ -2,6 +2,7 @@ # Macros for cmake # %__cmake %{_bindir}/cmake +%__ctest %{_bindir}/ctest %_cmake_debug %{?with_debug:debug}%{?!with_debug:release} %cmake \ @@ -38,3 +39,8 @@ cd build \ make DESTDIR=%{buildroot} install/fast \ cd .. + +%ctest \ + cd build \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \ + cd .. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de