- %{_libdir}/cmake moved to filesystem (3.0-52)

[packages/cmake.git] / cmake.spec

diff --git a/cmake.spec b/cmake.spec
index e9994b030843a9e871d383805ae4389eb400de9f..2831cf49da738717e8a51c626cf1b1c83e7e6c70 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -11,24 +11,23 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       2.8.5
-Release:       1
+Version:       2.8.6
+Release:       2
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5: 3c5d32cec0f4c2dc45f4c2e84f4a20c5
+# Source0-md5: 2147da452fd9212bb9b4542a9eee9d5b
 Patch0:                %{name}-lib64.patch
-Patch1:                %{name}-tinfo.patch
 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
 BuildRequires: libarchive-devel
 BuildRequires: libstdc++-devel
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel > 5.9-3
 %{?with_gui:BuildRequires:     qt4-build}
 %{?with_gui:BuildRequires:     qt4-qmake}
 BuildRequires: rpmbuild(macros) >= 1.167
 %{!?with_bootstrap:BuildRequires:      xmlrpc-c-devel >= 1.4.12-2}
-Requires:      filesystem >= 3.0-46
+Requires:      filesystem >= 3.0-52
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,7 +66,6 @@ CMake.
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
-%patch1 -p0
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -93,11 +91,11 @@ export LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/cmake
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_prefix}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -124,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cmake/Modules/*
 %{_datadir}/cmake/Templates
 %{_datadir}/cmake/include
-%dir %{_libdir}/cmake
+%{_aclocaldir}/cmake.m4
 
 %if %{with gui}
 %files gui