rpms/cmake/F-9 cmake.spec,1.32,1.33 macros.cmake,1.2,1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.2-3
- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/cmake.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cmake.spec	29 Sep 2008 21:58:46 -0000	1.32
+++ cmake.spec	9 Jan 2009 12:53:58 -0000	1.33
@@ -1,12 +1,14 @@
 # Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
 %bcond_with bootstrap
+# Set to bcond_with or use --without gui to disable qt4 gui build
+%bcond_without gui
 # Set to RC version if building RC, else %{nil}
 %define rcver %{nil}
 
 Name:           cmake
 Version:        2.6.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -17,9 +19,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
-BuildRequires:  qt4-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
-%{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
+%if %{without bootstrap}
+BuildRequires: xmlrpc-c-devel
+%endif
+%if %{with gui}
+BuildRequires: qt4-devel, desktop-file-utils
+%define qt_gui --qt-gui
+%else
+%define qt_gui %{nil}
+%endif
 Requires:       rpm
 
 
@@ -32,6 +41,7 @@
 generation, code generation, and template instantiation.
 
 
+%if %{with gui}
 %package        gui
 Summary:        Qt GUI for %{name}
 Group:          Development/Tools
@@ -39,6 +49,7 @@
 
 %description    gui
 The %{name}-gui package contains the Qt based GUI for CMake.
+%endif
 
 
 %prep
@@ -54,7 +65,7 @@
             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
             --%{?with_bootstrap:no-}system-libs \
             --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
-            --qt-gui
+            %{qt_gui}
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -68,10 +79,12 @@
 # RPM macros
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+%if %{with gui}
 # Desktop file
 desktop-file-install --delete-original \
   --dir=%{buildroot}%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/CMake.desktop
+%endif
 
 
 %check
@@ -83,6 +96,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{with gui}
 %post gui
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -90,6 +104,7 @@
 %postun gui
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
+%endif
 
 
 %files
@@ -104,15 +119,24 @@
 %{_mandir}/man1/*.1*
 %{_datadir}/emacs/
 
+%if %{with gui}
 %files gui
 %defattr(-,root,root,-)
 %{_bindir}/cmake-gui
 %{_datadir}/applications/CMake.desktop
 %{_datadir}/mime/packages/cmakecache.xml
 %{_datadir}/pixmaps/CMakeSetup.png
+%endif
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.2-3
+- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+
+* Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
+- Allow conditional build of gui
+
 * Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
 - Update to 2.6.2
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/macros.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macros.cmake	27 Jun 2007 17:00:25 -0000	1.2
+++ macros.cmake	9 Jan 2009 12:53:58 -0000	1.3
@@ -2,6 +2,7 @@
 # Macros for cmake
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %__cmake %{_bindir}/cmake
 
 %cmake \
@@ -9,6 +10,7 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
+        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
@@ -18,4 +20,5 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
+        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON