From b5260f393c2398ff1f775214b2c03ef3ea8d5be4046efa838557485d1c9ff910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 18 Aug 2014 08:21:42 +0000
Subject: [PATCH] - 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

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=168
---
 cmake.changes | 10 ++++++++++
 cmake.macros  |  6 ++++++
 cmake.spec    | 12 ++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/cmake.changes b/cmake.changes
index 12094c8..7f01eec 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Sun Aug 10 14:33:05 UTC 2014 - andreas.stieger@gmx.de
 
diff --git a/cmake.macros b/cmake.macros
index 969ee66..c79e2a8 100644
--- a/cmake.macros
+++ b/cmake.macros
@@ -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 ..
diff --git a/cmake.spec b/cmake.spec
index 05d8ac7..bf5978d 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -29,6 +29,7 @@ Source2:        opensuse_rules.cmake
 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 @@ export CFLAGS="$CXXFLAGS"
     --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 @@ sed -i \
 
 %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