- removed redundant libarchive R (soname dep is autodetected)

[packages/cmake.git] / cmake.spec

diff --git a/cmake.spec b/cmake.spec
index 6fae0cec84554f7675ff6e05aef9c36ffe2c78b6..bf597a64f1b1cc4c27e64ce017cebc7abafd476e 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -7,19 +7,21 @@
 # Conditional build:
 %bcond_with    bootstrap       # use internal versions of some libraries
 %bcond_without gui             # don't build gui package
-#
+
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       2.8.1
+Version:       2.8.3
 Release:       1
 License:       BSD
 Group:         Development/Building
 Source0:       http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5: a92ad653f9ccc1595d16cd9707f49acc
+# Source0-md5: a76a44b93acf5e3badda9de111385921
 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
 %{?with_gui:BuildRequires:     qt4-build}
@@ -64,6 +66,7 @@ CMake.
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
+%patch1 -p0
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -82,6 +85,7 @@ export LDFLAGS="%{rpmldflags}"
        --init=init.cmake \
        %{!?with_bootstrap:--system-libs} \
        %{?with_gui:--qt-gui} \
+       --qt-qmake=/usr/bin/qmake-qt4 \
        --verbose
 
 %{__make} VERBOSE=1
@@ -89,11 +93,10 @@ export LDFLAGS="%{rpmldflags}"
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/cmake
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+rm -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,7 +108,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cmake
 %attr(755,root,root) %{_bindir}/cpack
 %attr(755,root,root) %{_bindir}/ctest
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/ccmake.1*
+%{_mandir}/man1/cmake.1*
+%{_mandir}/man1/cmakecommands.1*
+%{_mandir}/man1/cmakecompat.1*
+%{_mandir}/man1/cmakemodules.1*
+%{_mandir}/man1/cmakepolicies.1*
+%{_mandir}/man1/cmakeprops.1*
+%{_mandir}/man1/cmakevars.1*
+%{_mandir}/man1/cpack.1*
+%{_mandir}/man1/ctest.1*
 %{_datadir}/cmake
 %dir %{_libdir}/cmake
 
@@ -116,4 +128,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/cmakecache.xml
 %{_desktopdir}/CMake.desktop
 %{_pixmapsdir}/CMakeSetup32.png
+%{_mandir}/man1/cmake-gui.1*
 %endif