From d6ff0da157220edb3b801e1efa0f1d5c5414abbf Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Tue, 5 Aug 2014 15:21:44 +0800
Subject: [PATCH] Update to 1.5.1

---
 .gitignore       |  1 +
 ninja-build.spec | 68 ++++++++++++++++--------------------------------
 sources          |  2 +-
 3 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8059d6c..65db9cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /v1.0.0.tar.gz
 /v1.3.4.tar.gz
 /v1.4.0.tar.gz
+/ninja-1.5.1.tar.gz
diff --git a/ninja-build.spec b/ninja-build.spec
index bdd6e12..8e646b0 100644
--- a/ninja-build.spec
+++ b/ninja-build.spec
@@ -1,23 +1,15 @@
-#global githash 5dc55a3
-
 Name:           ninja-build
-Version:        1.4.0
-Release:        2%{?dist}
-Group:          Development/Tools
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        A small build system with a focus on speed
-
 License:        ASL 2.0
 URL:            http://martine.github.com/ninja/
-#VCS:            git://github.com/martine/ninja.git
-# Snapshot from github
-# Downloaded from https://github.com/martine/ninja/tarball/%{githash}
-#Source0:        martine-ninja-%{githash}.tar.gz
-Source0:        https://github.com/martine/ninja/archive/v%{version}.tar.gz
+Source0:        https://github.com/martine/ninja/archive/v%{version}.tar.gz#/ninja-%{version}.tar.gz
 Source1:        ninja.vim
-
 BuildRequires:  asciidoc
 BuildRequires:  gtest-devel
-BuildRequires:  re2c
+BuildRequires:  python2-devel
+BuildRequires:  re2c >= 0.11.3
 Requires:       emacs-filesystem
 Requires:       vim-filesystem
 
@@ -27,49 +19,33 @@ build systems in two major respects: it is designed to have its input files
 generated by a higher-level build system, and it is designed to run builds as
 fast as possible.
 
-
 %prep
-%setup -q -n ninja-%{version}
-
+%setup -qn ninja-%{version}
 
 %build
-CFLAGS="%{optflags}"
-export CFLAGS
-./bootstrap.py --verbose -- --debug
+CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
+%{__python2} bootstrap.py --verbose --debug
 ./ninja -v manual
 ./ninja -v ninja_test
 
+%install
+# TODO: Install ninja_syntax.py?
+mkdir -p %{buildroot}/{%{_bindir},%{_sysconfdir}/bash_completion.d,%{_datadir}/emacs/site-lisp,%{_datadir}/vim/vimfiles/syntax,%{_datadir}/vim/vimfiles/ftdetect,%{_datadir}/zsh/site-functions}
+
+install -pm755 ninja %{buildroot}%{_bindir}/ninja-build
+install -pm644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja-bash-completion
+install -pm644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninja-mode.el
+install -pm644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.vim
+install -pm644 %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
+install -pm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
 
 %check
 # workaround possible too low default limits
-ulimit -n 2048
-ulimit -u 2048
-
+ulimit -n 2048 && ulimit -u 2048
 ./ninja_test
 
-
-%install
-# TODO: Install ninja_syntax.py?
-install -p -m 755 -d %{buildroot}%{_bindir}
-install -p -m 755 ninja %{buildroot}%{_bindir}/ninja-build
-
-install -p -m 755 -d %{buildroot}%{_sysconfdir}/bash_completion.d
-install -p -m 644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja-bash-completion
-
-install -p -m 755 -d %{buildroot}%{_datadir}/emacs/site-lisp
-install -p -m 644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninja-mode.el
-
-install -p -m 755 -d %{buildroot}%{_datadir}/vim/vimfiles/syntax
-install -p -m 644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.vim
-install -p -m 755 -d %{buildroot}%{_datadir}/vim/vimfiles/ftdetect
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
-
-install -p -m 755 -d %{buildroot}%{_datadir}/zsh/site-functions
-install -p -m 644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
-
-
 %files
-%doc COPYING README doc/manual.html
+%doc COPYING HACKING.md README doc/manual.html
 %{_bindir}/ninja-build
 # bash-completion does not own this
 %{_sysconfdir}/bash_completion.d/
@@ -79,8 +55,10 @@ install -p -m 644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions
 # zsh does not have a -filesystem package
 %{_datadir}/zsh/
 
-
 %changelog
+* Tue Aug 05 2014 Christopher Meng <rpm@cicku.me> - 1.5.1-1
+- Update to 1.5.1
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 7b549e1..680047c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cff1cd76e132c0af86a8bf9f6d811eb6  v1.4.0.tar.gz
+59f4f1cf5d9bb0d7877a6d5a5afd770a  ninja-1.5.1.tar.gz