rpms/cmake/devel cmake.spec,1.55,1.56 macros.cmake,1.4,1.5

[Rex Dieter]

Author: rdieter

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

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
- macros.cmake: +%_cmake_version



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cmake.spec	9 Mar 2009 02:00:11 -0000	1.55
+++ cmake.spec	16 Mar 2009 16:20:14 -0000	1.56
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -78,6 +78,9 @@
 install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 # RPM macros
 install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
+sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
+
 %if %{with gui}
 # Desktop file
 desktop-file-install --delete-original \
@@ -129,6 +132,9 @@
 
 
 %changelog
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
+- macros.cmake: +%%_cmake_version
+
 * Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.6.3-2
 - Fix crash during kdepimlibs build (#475876)
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/macros.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- macros.cmake	4 Jan 2009 21:10:23 -0000	1.4
+++ macros.cmake	16 Mar 2009 16:20:14 -0000	1.5
@@ -3,6 +3,7 @@
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
 %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
+%_cmake_version @@CMAKE_VERSION@@
 %__cmake %{_bindir}/cmake
 
 %cmake \