From 007a4a15a962ae4532011e0b7b122fe447858f8839fc432e2d1e992690f427f7 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 12 Sep 2017 08:42:01 +0000
Subject: [PATCH] - Update to version 1.8.2:   * Restore tolerance of
 self-referencing phony build statements   * Factor ManifestParser options
 into a structure - Drop support for building on old distributions

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=38
---
 ninja-1.8.1.tar.gz |  3 ---
 ninja-1.8.2.tar.gz |  3 +++
 ninja.changes      |  8 ++++++++
 ninja.spec         | 20 +++++---------------
 4 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 ninja-1.8.1.tar.gz
 create mode 100644 ninja-1.8.2.tar.gz

diff --git a/ninja-1.8.1.tar.gz b/ninja-1.8.1.tar.gz
deleted file mode 100644
index b67ca36..0000000
--- a/ninja-1.8.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b975832a09021381a50dab9fd66ee83b525102408c3eea573b638ca63908f5ea
-size 184206
diff --git a/ninja-1.8.2.tar.gz b/ninja-1.8.2.tar.gz
new file mode 100644
index 0000000..b7e1606
--- /dev/null
+++ b/ninja-1.8.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4
+size 185226
diff --git a/ninja.changes b/ninja.changes
index 5653162..e769aaa 100644
--- a/ninja.changes
+++ b/ninja.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep 12 08:38:18 UTC 2017 - mpluskal@suse.com
+
+- Update to version 1.8.2:
+  * Restore tolerance of self-referencing phony build statements
+  * Factor ManifestParser options into a structure
+- Drop support for building on old distributions
+
 -------------------------------------------------------------------
 Thu Sep  7 14:44:24 UTC 2017 - idonmez@suse.com
 
diff --git a/ninja.spec b/ninja.spec
index 70de253..2e10e17 100644
--- a/ninja.spec
+++ b/ninja.spec
@@ -17,7 +17,7 @@
 
 
 Name:           ninja
-Version:        1.8.1
+Version:        1.8.2
 Release:        0
 Summary:        A small build system closest in spirit to Make
 License:        Apache-2.0
@@ -27,18 +27,13 @@ Source0:        https://github.com/ninja-build/ninja/archive/v%{version}.tar.gz#
 Source1:        macros.ninja
 Patch1:         ninja-disable-maxprocs-test.patch
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} <= 1110
-BuildRequires:  python-base
-%else
 BuildRequires:  python3-base
-%endif
 BuildRequires:  re2c
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Ninja is yet another build system.
-It takes as input the interdependencies of files (typically source code and output executables)
-and orchestrates building them, quickly.
+Ninja is yet another build system. It takes as input the interdependencies
+of files (typically source code and output executables) and orchestrates
+building them, quickly.
 
 %prep
 %setup -q
@@ -47,25 +42,20 @@ and orchestrates building them, quickly.
 %build
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
-%if 0%{?suse_version} <= 1110
-python2./configure.py --bootstrap --verbose
-%else
 python3 ./configure.py --bootstrap --verbose
-%endif
 
 %install
 install -D -p -m 0755 ninja %{buildroot}%{_bindir}/ninja
 install -D -p -m 0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
 install -D -p -m 0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/site/syntax/ninja.vim
 install -D -p -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja
-install -D -p -m 0644 %{S:1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ninja
+install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ninja
 
 %check
 ./ninja ninja_test
 ./ninja_test
 
 %files
-%defattr(-,root,root)
 %doc COPYING
 %{_bindir}/ninja
 %{_datadir}/zsh