diff --git a/cmake.spec b/cmake.spec index c33cc99..ebb5fd4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -160,6 +160,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Tue Feb 21 2012 Orion Poplawski - 2.8.7-5 +- Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542) + * Thu Jan 26 2012 Tomas Bzatek - 2.8.7-4 - Rebuilt for new libarchive diff --git a/macros.cmake b/macros.cmake index cc4df56..69f4b5e 100644 --- a/macros.cmake +++ b/macros.cmake @@ -14,12 +14,4 @@ %__cmake \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ - -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -%if "%{?_lib}" == "lib64" \ - %{?_cmake_lib_suffix64} \\\ -%endif \ -DBUILD_SHARED_LIBS:BOOL=ON