rpms/cmake/devel cmake.spec,1.45,1.46 macros.cmake,1.2,1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19679

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Tue Dec 2 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.2-3
- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %cmake (#474053)
- preserve timestamp of macros.cmake
- cosmetics



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cmake.spec	22 Oct 2008 17:07:35 -0000	1.45
+++ cmake.spec	2 Dec 2008 17:46:08 -0000	1.46
@@ -26,8 +26,6 @@
 %if %{with gui}
 BuildRequires: qt4-devel, desktop-file-utils
 %define qt_gui --qt-gui
-%else
-%define qt_gui %{nil}
 %endif
 Requires:       rpm
 
@@ -41,7 +39,6 @@
 generation, code generation, and template instantiation.
 
 
-%if %{with gui}
 %package        gui
 Summary:        Qt GUI for %{name}
 Group:          Development/Tools
@@ -49,7 +46,6 @@
 
 %description    gui
 The %{name}-gui package contains the Qt based GUI for CMake.
-%endif
 
 
 %prep
@@ -65,7 +61,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}
 
 
@@ -77,8 +73,7 @@
 cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
 install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 # RPM macros
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
 %if %{with gui}
 # Desktop file
 desktop-file-install --delete-original \
@@ -130,6 +125,11 @@
 
 
 %changelog
+* Tue Dec 2 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.2-3
+- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053)
+- preserve timestamp of macros.cmake
+- cosmetics
+
 * Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
 - Allow conditional build of gui
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/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	2 Dec 2008 17:46:08 -0000	1.3
@@ -9,6 +9,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} \\\