From c3e8dd85cfd3639ea542c2ab6250e823d85ffae9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 8 Feb 2013 09:35:42 -0700 Subject: [PATCH] Add patch to use ninja-build (bug #886184) --- cmake-ninja.patch | 23 +++++++++++++++++++++++ cmake.spec | 11 +++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 cmake-ninja.patch diff --git a/cmake-ninja.patch b/cmake-ninja.patch new file mode 100644 index 0000000..1ea3017 --- /dev/null +++ b/cmake-ninja.patch @@ -0,0 +1,23 @@ +diff -up cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake +--- cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja 2012-11-27 06:26:32.000000000 -0700 ++++ cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake 2013-02-08 09:30:26.437739370 -0700 +@@ -12,6 +12,6 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + +-find_program(CMAKE_MAKE_PROGRAM ninja ++find_program(CMAKE_MAKE_PROGRAM ninja-build + DOC "Program used to build from build.ninja files.") + mark_as_advanced(CMAKE_MAKE_PROGRAM) +diff -up cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx +--- cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja 2012-11-27 06:26:33.000000000 -0700 ++++ cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx 2013-02-08 09:32:30.397949661 -0700 +@@ -1034,7 +1034,7 @@ std::string cmGlobalNinjaGenerator::ninj + lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"), + cmLocalGenerator::SHELL); + } +- return "ninja"; ++ return "ninja-build"; + } + + void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os) diff --git a/cmake.spec b/cmake.spec index 49d4aee..a903f49 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.10.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -25,6 +25,9 @@ Patch0: cmake-dcmtk.patch # Patch to fix RindRuby vendor settings # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 +# Patch to use ninja-build instead of ninja (renamed in Fedora) +# https://bugzilla.redhat.com/show_bug.cgi?id=886184 +Patch1: cmake-ninja.patch Patch2: cmake-findruby.patch # Patch to fix FindPostgreSQL # https://bugzilla.redhat.com/show_bug.cgi?id=828467 @@ -83,6 +86,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} %patch0 -p1 -b .dcmtk +%patch1 -p1 -b .ninja %patch2 -p1 -b .findruby %patch3 -p1 -b .findpostgresql %patch4 -p1 -b .ccmake-del @@ -182,7 +186,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog -* Thu Jan 24 2013 Orion Poplawski - 2.8.10.1-3 +* Fri Feb 8 2013 Orion Poplawski - 2.8.10.2-4 +- Add patch to use ninja-build (bug #886184) + +* Thu Jan 24 2013 Orion Poplawski - 2.8.10.2-3 - Update FindPostgreSQL patch to use PostgreSQL_LIBRARY (bug #903757) * Thu Jan 17 2013 Tomas Bzatek - 2.8.10.2-2