X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=blobdiff_plain;f=cmake.spec;h=7b70bf598998cf882dc4b090f8ec651f42decd64;hp=7607a2ec0bd3224720cb8e2295b0a202bf84d438;hb=77f8acdd9d9ce9e4319ecb3580ba632d81f09f30;hpb=4d2fe2541bc37ad6e085c3eb0d62be60b122d187

diff --git a/cmake.spec b/cmake.spec
index 7607a2e..7b70bf5 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,24 +1,33 @@
-# TODO: any valid CMAKE_BUILD_TYPE causes overriding of our optflags
-#       (and default non-verbose makefiles are hiding it!)
+# TODO:
+# - any valid CMAKE_BUILD_TYPE causes overriding of our optflags
+#   (and default non-verbose makefiles are hiding it!)
+# - rpmldflags/rpmcppflags are not passed through %%cmake macro at all
+#   (is there any standard way???)
 #
 # Conditional build:
-%bcond_with	bootstrap # use internal versions of some libraries
-#
+%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.6.0
-Release:	0.1
+Version:	2.8.2
+Release:	2
 License:	BSD
 Group:		Development/Building
-Source0:	http://www.cmake.org/files/v2.6/%{name}-%{version}.tar.gz
-# Source0-md5:	e95ae003672dfc6c8151a1ee49a0d4a6
-Patch1:		%{name}-lib64.patch
-URL:		http://www.cmake.org/HTML/Index.html
+Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
+# Source0-md5:	8c967d5264657a798f22ee23976ff0d9
+Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-tinfo.patch
+Patch2:		python-2.7.patch
+URL:		http://www.cmake.org/
+%{?with_gui:BuildRequires:	QtGui-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
+%{?with_gui:BuildRequires:	qt4-build}
+%{?with_gui:BuildRequires:	qt4-qmake}
 BuildRequires:	rpmbuild(macros) >= 1.167
-%{!?with_bootstrap:BuildRequires:	xmlrpc-c-devel}
+%{!?with_bootstrap:BuildRequires:	xmlrpc-c-devel >= 1.4.12-2}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,19 +44,33 @@ CMake służy do sterowania procesem kompilacji oprogramowania przy
 użyciu prostych plików konfiguracyjnych niezależnych od platformy i
 kompilatora. CMake generuje natywne pliki makefile i workspace,
 których można używać w wybranym środowisku kompilatora. CMake jest
-dość przemyślany: może obsłużyć złożone środowiska wymagające
+dość wyrafinowany: może obsłużyć złożone środowiska wymagające
 konfiguracji systemu, generowanie preprocesora, generowanie kodu i
 dziedziczenie szablonów.
 
+%package gui
+Summary:	Qt GUI for CMake
+Summary(pl.UTF-8):	Graficzny interfejs użytkownika Qt dla CMake
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description gui
+This package contains the Qt based GUI for CMake.
+
+%description gui -l pl.UTF-8
+Ten pakiet zawiera oparty na Qt graficzny interfejs użytkownika dla
+CMake.
+
 %prep
 %setup -q
 %if "%{_lib}" == "lib64"
-%patch1 -p1
+%patch0 -p1
 %endif
+%patch1 -p0
+%patch2 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
-SET (CMAKE_AR "%{__ar}" CACHE FILEPATH " " FORCE)
 EOF
 
 %build
@@ -62,17 +85,18 @@ export LDFLAGS="%{rpmldflags}"
 	--datadir=/share/cmake \
 	--init=init.cmake \
 	%{!?with_bootstrap:--system-libs} \
+	%{?with_gui:--qt-gui} \
 	--verbose
 
-%{__make}
+%{__make} VERBOSE=1
 
 %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
@@ -86,3 +110,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ctest
 %{_mandir}/man1/*.1*
 %{_datadir}/cmake
+%dir %{_libdir}/cmake
+
+%if %{with gui}
+%files gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cmake-gui
+%{_datadir}/mime/packages/cmakecache.xml
+%{_desktopdir}/CMake.desktop
+%{_pixmapsdir}/CMakeSetup32.png
+%endif