From 26b9c7cdde8557ab5abd517039bf3346fad078c29582053b60182a7feea3bac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Mon, 29 Sep 2014 12:43:54 +0000
Subject: [PATCH] - Cleanup with spec-cleaner (minor whitespace)

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

diff --git a/scons.changes b/scons.changes
index 3f3676a..31ced7f 100644
--- a/scons.changes
+++ b/scons.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 29 12:43:29 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner (minor whitespace)
+
 -------------------------------------------------------------------
 Thu Aug 28 20:46:40 UTC 2014 - andreas.stieger@gmx.de
 
diff --git a/scons.spec b/scons.spec
index 41e5774..edf7d63 100644
--- a/scons.spec
+++ b/scons.spec
@@ -18,16 +18,16 @@
 
 # Potential build fix for SLE11 SLE11SP1
 %if 0%{?suse_version} <= 1120
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
-
 Name:           scons
+Version:        2.3.3
+Release:        0
 Summary:        Replacement for Make
 License:        MIT
 Group:          Development/Tools/Building
-Version:        2.3.3
-Release:        0
+Url:            http://www.scons.org/
 Source0:        http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.gz
 #http://www.scons.org/doc/%%{version}/HTML/scons-user.html
 Source1:        scons-user.html-%{version}.tar.bz2
@@ -36,14 +36,12 @@ 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
-Url:            http://www.scons.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  python-devel >= 2.4
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
-%{py_requires}
 
 %description
 SCons is a make replacement that provides a range of enhanced features,
@@ -66,8 +64,10 @@ patch -p0 <<EOF
 +                   QT_LIBPATH = os.path.join('\$QTDIR', '%_lib'),
 EOF
 
+sed -i 's|/usr/bin/env python|/usr/bin/python|' script/*
+
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
 python setup.py build
 
 %install
@@ -78,8 +78,6 @@ python setup.py \install \
 	--no-version-script
 %fdupes %{buildroot}%{_bindir}
 
-%check
-
 %files
 %defattr(-,root,root)
 %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html