[meego-commits] 6586: Changes to Trunk:Testing/cmake

[Fathi Boudra]

Hi,
I have made the following changes to cmake in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #6586:

  submit:   home:boudra:branches:Trunk:Testing/cmake(r2)(cleanup) -> Trunk:Testing/cmake


Message:
    * Fri Aug 13 2010 Fathi Boudra <fathi.boudra at nokia.com> - 2.8.2
- Drop cmake-gui to avoid to be blocked by Qt
- Remove BuildRequires: pkgconfig(QtGui), desktop-file-utils, libX11-devel

State:   new          2010-08-13T00:15:44 boudra
Comment: None



changes files:
--------------
--- cmake.changes
+++ cmake.changes
@@ -0,0 +1,4 @@
+* Fri Aug 13 2010 Fathi Boudra <fathi.boudra at nokia.com> - 2.8.2
+- Drop cmake-gui to avoid to be blocked by Qt
+- Remove BuildRequires: pkgconfig(QtGui), desktop-file-utils, libX11-devel
+

spec files:
-----------
--- cmake.spec
+++ cmake.spec
@@ -10,11 +10,8 @@
 Source0:        http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 Source1:        macros.cmake
 Patch0:         add_findlibarchive_cmake_module.patch
-BuildRequires:  pkgconfig(QtGui)
 BuildRequires:  curl-devel
-BuildRequires:  desktop-file-utils
 BuildRequires:  expat-devel
-BuildRequires:  libX11-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  procps
@@ -30,21 +27,6 @@
 requiring system configuration, pre-processor generation, code generation, and
 template instantiation.
 
-%package        gui
-Summary:        Qt based user interface for CMake (cmake-gui)
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
-
-%description    gui
-CMake is used to control the software compilation process using simple platform
-and compiler independent configuration files. CMake generates native makefiles
-and workspaces that can be used in the compiler environment of your choice.
-
-This package provides the CMake Qt based GUI. Project configuration settings
-may be specified interactively. Brief instructions are provided at the bottom
-of the window when the program is running. The main executable file for this
-GUI is "cmake-gui".
-
 %prep
 %setup -q
 %patch0 -p1
@@ -60,7 +42,7 @@
 set(CMAKE_CXX_FLAGS "%{optflags}" CACHE STRING "C++ flags" FORCE)
 set(CMAKE_SKIP_BOOTSTRAP_TEST ON CACHE BOOL "Skip BootstrapTest" FORCE)
 set(BUILD_CursesDialog TRUE CACHE BOOL "Build curses GUI" FORCE)
-set(BUILD_QtDialog TRUE CACHE BOOL "Build Qt4 GUI" FORCE)
+set(BUILD_QtDialog FALSE CACHE BOOL "Build Qt4 GUI" FORCE)
 set(MINGW_CC_LINUX2WIN_EXECUTABLE "" CACHE FILEPATH "Never detect mingw" FORCE)
 set(CMAKE_USE_SYSTEM_LIBARCHIVE YES CACHE BOOL "" FORCE)
 set(CTEST_USE_XMLRPC YES CACHE BOOL "" FORCE)
@@ -86,19 +68,6 @@
 # Install cmake rpm macros
 install -D -p -m 0644 %{_sourcedir}/macros.cmake \
   %{buildroot}%{_sysconfdir}/rpm/macros.cmake
-# Install desktop file
-desktop-file-install \
-  --delete-original \
-  --dir=%{buildroot}%{_datadir}/applications \
-  %{buildroot}%{_datadir}/applications/CMake.desktop
-
-%post gui
-update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
-%postun gui
-update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -111,10 +80,3 @@
 %{_datadir}/%{name}/
 %{_mandir}/man1/*.1*
 %{_datadir}/emacs/
-
-%files gui
-%defattr(-,root,root,-)
-%{_bindir}/cmake-gui
-%{_datadir}/applications/CMake.desktop
-%{_datadir}/mime/packages/cmakecache.xml
-%{_datadir}/pixmaps/CMakeSetup32.png

other changes:
--------------