Accepting request 231232 from home:dirkmueller:branches:devel:tools:building

- fix build on SLE11
- remove dependency on system curl: this is not a security
  senstive app and the system curl comes quite late in the
  build cycle
- remove nonsensical checks for %{sles_version}

OBS-URL: https://build.opensuse.org/request/show/231232
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=145

cmake.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 23 17:15:17 UTC 2014 - dmueller@suse.com
+
+- fix build on SLE11
+- remove dependency on system curl: this is not a security
+  senstive app and the system curl comes quite late in the
+  build cycle
+- remove nonsensical checks for %{sles_version}
+
 -------------------------------------------------------------------
 Thu Mar 20 01:42:01 UTC 2014 - hrvoje.senjan@gmail.com
 

cmake.spec

@@ -33,19 +33,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1010
 BuildRequires:  fdupes
 %endif
-%if 0%{?sles_version} != 10
+%if 0%{?suse_version} > 1110
 BuildRequires:  libarchive-devel
+BuildRequires:  libbz2-devel
 %endif
 BuildRequires:  libexpat-devel
-%else
-BuildRequires:  expat-devel
 %endif
-BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  ncurses-devel
-BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(bzip2)
 
 Requires:       make
 
@@ -64,16 +60,13 @@ export CFLAGS="$CXXFLAGS"
     --datadir=/share/%{name} \
     --docdir=/share/doc/packages/%{name} \
     --mandir=/share/man \
-%if 0%{?suse_version} && !0%{?sles_version}
     --system-libs \
-%else
+    --no-system-curl \
-    --system-curl \
+%if 0%{?suse_version} <= 1110
-    --system-expat \
-    --system-zlib \
-    --system-bzip2 \
     --no-system-libarchive \
 %endif
     --parallel=0%jobs \
+    --verbose \
     --no-qt-gui
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -102,6 +95,7 @@ sed -i \
 %{_bindir}/ccmake
 %{_datadir}/cmake
 %{_libdir}/cmake
+%dir %{_datadir}/aclocal
 %{_datadir}/aclocal/cmake.m4
 %doc %{_datadir}/doc/packages/%{name}