From 1ea9fac37c5527ea416c930e734341e457bc4372 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 16 2009 16:20:14 +0000 Subject: - macros.cmake: +%_cmake_version --- diff --git a/cmake.spec b/cmake.spec index baf2b9f..9f99f4f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -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 @@ 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 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 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Mar 16 2009 Rex Dieter - 2.6.3-3 +- macros.cmake: +%%_cmake_version + * Mon Mar 09 2009 Kevin Kofler - 2.6.3-2 - Fix crash during kdepimlibs build (#475876) diff --git a/macros.cmake b/macros.cmake index 42ada23..f87d602 100644 --- a/macros.cmake +++ b/macros.cmake @@ -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 \