- BR: curl-devel expat-devel zlib-devel

[packages/cmake.git] / cmake.spec

diff --git a/cmake.spec b/cmake.spec
index bcd487747ad409733e9423f900786b0a7e1ec411..cb12c1946c6ff5e9b17f1fc6477f9c0ad267cb70 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -14,22 +14,23 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.1.3
-Release:       3
+Version:       3.5.0
+Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       http://www.cmake.org/files/v3.1/%{name}-%{version}.tar.gz
-# Source0-md5: 5697a77503bb5636f4b4057dcc02aa32
+Source0:       http://www.cmake.org/files/v3.5/%{name}-%{version}.tar.gz
+# Source0-md5: 33c5d09d4c33d4ffcc63578a6ba8777e
 Patch0:                %{name}-lib64.patch
-Patch1:                %{name}-helpers.patch
-Patch2:                %{name}-findruby.patch
-Patch3:                %{name}-tests.patch
-Patch4:                %{name}-bug-0015258.patch
-Patch5:                %{name}-findruby2.patch
-Patch6:                %{name}-findpython.patch
-Patch7:                %{name}-libx32.patch
+Patch1:                %{name}-libx32.patch
+Patch2:                %{name}-helpers.patch
+Patch3:                %{name}-findruby.patch
+Patch4:                %{name}-findruby2.patch
+Patch5:                man-syntax.patch
 URL:           http://www.cmake.org/
 %{?with_gui:BuildRequires:     QtGui-devel}
+BuildRequires: curl-devel
+BuildRequires: expat-devel
+BuildRequires: jsoncpp-devel >= 1.6.2-2
 BuildRequires: libarchive-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel > 5.9-3
@@ -38,6 +39,7 @@ BuildRequires:        ncurses-devel > 5.9-3
 BuildRequires: rpmbuild(macros) >= 1.167
 %{?with_doc:BuildRequires:     sphinx-pdg}
 %{!?with_bootstrap:BuildRequires:      xmlrpc-c-devel >= 1.4.12-2}
+BuildRequires: zlib-devel
 Requires:      filesystem >= 3.0-52
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -115,15 +117,13 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %if "%{_lib}" == "lib64"
 %patch0 -p1
 %endif
+%if "%{_lib}" == "libx32"
 %patch1 -p1
+%endif
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%if "%{_lib}" == "libx32"
-%patch7 -p1
-%endif
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -147,7 +147,7 @@ export LDFLAGS="%{rpmldflags}"
        --init=init.cmake \
        %{!?with_bootstrap:--system-libs} \
        %{?with_gui:--qt-gui} \
-       --qt-qmake=/usr/bin/qmake-qt4 \
+       --qt-qmake=%{_bindir}/qmake-qt4 \
        %{?with_doc:--sphinx-html} \
        %{?with_doc:--sphinx-man} \
        --verbose
@@ -214,7 +214,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/cmake-gui
 %{_datadir}/mime/packages/cmakecache.xml
 %{_desktopdir}/CMake.desktop
-%{_pixmapsdir}/CMakeSetup32.png
+%{_iconsdir}/hicolor/128x128/apps/CMakeSetup.png
+%{_iconsdir}/hicolor/32x32/apps/CMakeSetup.png
 %{_mandir}/man1/cmake-gui.1*
 %endif
 
@@ -224,6 +225,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/cmake
-%{_datadir}/bash-completion/completions/cpack
-%{_datadir}/bash-completion/completions/ctest
+%{bash_compdir}/cmake
+%{bash_compdir}/cpack
+%{bash_compdir}/ctest