Browse Source

ninja: update to 1.6.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9964 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 8 years ago
parent
commit
4e676bef69
1 changed files with 29 additions and 49 deletions
  1. 29 49
      n/ninja/ninja-vl.spec

+ 29 - 49
n/ninja/ninja-vl.spec

@@ -1,25 +1,16 @@
-#global githash 5dc55a3
-
 Name:           ninja
-Version:        1.4.0
+Version:        1.6.0
 Release:        1%{?_dist_release}
-Group:          Development/Tools
 Summary:        A small build system with a focus on speed
-
+Summary(ja):    スピードを重視した小さなビルドシステム
 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
-Requires:       emacsen
-Requires:       vim
+BuildRequires:  python-devel
+BuildRequires:  re2c >= 0.11.3
 
 %description
 Ninja is a small build system with a focus on speed. It differs from other
@@ -27,64 +18,53 @@ 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}" \
+%{__python} configure.py --bootstrap --verbose
 ./ninja -v manual
 ./ninja -v ninja_test
 
-
-%check
-# workaround possible too low default limits
-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
-
-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
+mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/bash-completion/completions,%{_datadir}/emacs/site-lisp,%{_datadir}/vim/vimfiles/syntax,%{_datadir}/vim/vimfiles/ftdetect,%{_datadir}/zsh/site-functions}
 
-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
+install -pm755 ninja %{buildroot}%{_bindir}/ninja
+ln -sf ninja %{buildroot}%{_bindir}/ninja-build
+install -pm644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/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 4096 && ulimit -u 4096
+./ninja_test
 
 %files
-%doc COPYING README doc/manual.html
+%doc COPYING HACKING.md README doc/manual.html
 %{_bindir}/ninja
-# bash-completion does not own this
-%{_sysconfdir}/bash_completion.d/
+%{_bindir}/ninja-build
+%{_datadir}/bash-completion/completions/ninja-bash-completion
 %{_datadir}/emacs/site-lisp/ninja-mode.el
 %{_datadir}/vim/vimfiles/syntax/ninja.vim
 %{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 # zsh does not have a -filesystem package
 %{_datadir}/zsh/
 
-
 %changelog
+* Mon Jan 18 2016 Daisuke SUZUKI <daisuke@vinelinux.org> 1.6.0-1
+- update to 1.6.0
+- remove R: vim, emacsen
+  (TODO: vim or el should be splitted to subpackage)
+- add ninja-build symlink to compatible with other rpm distros.
+
 * Thu Jun 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.4.0-1
 - initial build for Vine Linux
 
-
 * Wed Nov 20 2013 Ben Boeckel <mathstuf@gmail.com> - 1.4.0-1
 - Update to 1.4.0