From 9694cfe120e55d4f790ee4eedb2cc903be484b702086ba4009b081ad71697eed Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 16 Oct 2012 10:53:35 +0000
Subject: [PATCH 1/2] Accepting request 135596 from home:MargueriteSu

update version 2.2.0

OBS-URL: https://build.opensuse.org/request/show/135596
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=17
---
 scons-2.1.0.tar.gz | 3 ---
 scons-2.2.0.tar.gz | 3 +++
 scons.changes      | 6 ++++++
 scons.spec         | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)
 delete mode 100644 scons-2.1.0.tar.gz
 create mode 100644 scons-2.2.0.tar.gz

diff --git a/scons-2.1.0.tar.gz b/scons-2.1.0.tar.gz
deleted file mode 100644
index cbd9a57..0000000
--- a/scons-2.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4139ed14f60dd2ebcd47c59984d14705636180eb27b3d1b2949489e514b1921d
-size 574666
diff --git a/scons-2.2.0.tar.gz b/scons-2.2.0.tar.gz
new file mode 100644
index 0000000..9526681
--- /dev/null
+++ b/scons-2.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64bf078454a9856ec0ab465b9
+size 591836
diff --git a/scons.changes b/scons.changes
index 842e7f7..a351a5a 100644
--- a/scons.changes
+++ b/scons.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 22 20:20:39 UTC 2012 - i@marguerite.su
+
+- Update to 2.2.0
+  * see http://www.scons.org/CHANGES.txt 
+
 -------------------------------------------------------------------
 Tue Oct 11 22:52:27 UTC 2011 - nmarques@opensuse.org
 
diff --git a/scons.spec b/scons.spec
index fd22ed8..3bdc03e 100644
--- a/scons.spec
+++ b/scons.spec
@@ -24,7 +24,7 @@
 
 Name:           scons
 Summary:        Replacement for Make
-Version:        2.1.0
+Version:        2.2.0
 Release:        1
 Source0:        http://freefr.dl.sourceforge.net/project/scons/scons/%{version}/%{name}-%{version}.tar.gz
 Source1:        scons-user.html
@@ -68,7 +68,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-lib=%{py_sitedir}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-lib=%{python_sitearch}
 %fdupes %{buildroot}%{_bindir}
 
 %files

From b86659dc50ca05e473e051cfd135be60a8691535005b22dfca5f85c9b72ed3c0 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 16 Oct 2012 10:54:54 +0000
Subject: [PATCH 2/2] * Added gettext toolset   * Fixed FindSourceFiles to find
 final sources (leaf nodes)   * Allow Node objects in Java path (#2825)   *
 Fixed the Taskmaster, curing spurious build failures   * Improved
 documentation of command-line variables

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=18
---
 scons.changes | 6 +++++-
 scons.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scons.changes b/scons.changes
index a351a5a..87a279f 100644
--- a/scons.changes
+++ b/scons.changes
@@ -2,7 +2,11 @@
 Sat Sep 22 20:20:39 UTC 2012 - i@marguerite.su
 
 - Update to 2.2.0
-  * see http://www.scons.org/CHANGES.txt 
+  * Added gettext toolset
+  * Fixed FindSourceFiles to find final sources (leaf nodes)
+  * Allow Node objects in Java path (#2825)
+  * Fixed the Taskmaster, curing spurious build failures
+  * Improved documentation of command-line variables
 
 -------------------------------------------------------------------
 Tue Oct 11 22:52:27 UTC 2011 - nmarques@opensuse.org
diff --git a/scons.spec b/scons.spec
index 3bdc03e..f494ac4 100644
--- a/scons.spec
+++ b/scons.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package scons
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,8 +24,10 @@
 
 Name:           scons
 Summary:        Replacement for Make
+License:        MIT
+Group:          Development/Tools/Building
 Version:        2.2.0
-Release:        1
+Release:        0
 Source0:        http://freefr.dl.sourceforge.net/project/scons/scons/%{version}/%{name}-%{version}.tar.gz
 Source1:        scons-user.html
 # rpmlintrc
@@ -33,8 +35,6 @@ Source99:       %{name}-rpmlintrc
 # Sets _mandir to _datadir/man instead of _prefix/man
 Patch0:         %{name}-1.2.0-fix-install.patch
 Patch1:         %{name}-1.2.0-noenv.patch
-License:        MIT
-Group:          Development/Tools/Building
 Url:            http://www.scons.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes