From 26b9c7cdde8557ab5abd517039bf3346fad078c29582053b60182a7feea3bac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 29 Sep 2014 12:43:54 +0000 Subject: [PATCH 1/4] - 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 < Date: Sun, 5 Oct 2014 14:59:53 +0000 Subject: [PATCH 2/4] Accepting request 254018 from home:AndreasStieger:branches:devel:tools:building SCons 2.3.4 OBS-URL: https://build.opensuse.org/request/show/254018 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=31 --- scons-2.3.3.tar.gz | 3 --- scons-2.3.4.tar.gz | 3 +++ scons-user.html-2.3.3.tar.bz2 | 3 --- scons-user.html-2.3.4.tar.bz2 | 3 +++ scons.changes | 9 +++++++++ scons.spec | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 scons-2.3.3.tar.gz create mode 100644 scons-2.3.4.tar.gz delete mode 100644 scons-user.html-2.3.3.tar.bz2 create mode 100644 scons-user.html-2.3.4.tar.bz2 diff --git a/scons-2.3.3.tar.gz b/scons-2.3.3.tar.gz deleted file mode 100644 index 51c2f2c..0000000 --- a/scons-2.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63a74e1012ad9ad54950eafc69604fd9246e1a405c18acf936caa433c97cc0e2 -size 622434 diff --git a/scons-2.3.4.tar.gz b/scons-2.3.4.tar.gz new file mode 100644 index 0000000..4c7b53c --- /dev/null +++ b/scons-2.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441 +size 621953 diff --git a/scons-user.html-2.3.3.tar.bz2 b/scons-user.html-2.3.3.tar.bz2 deleted file mode 100644 index 632f2aa..0000000 --- a/scons-user.html-2.3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6114afd3cd21c6b0e4562ba1a1b903ef5eac97240600b53eeddf2eab6fa29363 -size 149235 diff --git a/scons-user.html-2.3.4.tar.bz2 b/scons-user.html-2.3.4.tar.bz2 new file mode 100644 index 0000000..5e2fdd2 --- /dev/null +++ b/scons-user.html-2.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4be8465969f5e7a97d20d515d720d67be4061ff801900247cba995ed5b10e893 +size 149286 diff --git a/scons.changes b/scons.changes index 31ced7f..f0437ac 100644 --- a/scons.changes +++ b/scons.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Oct 5 14:55:49 UTC 2014 - andreas.stieger@gmx.de + +- SCons 2.3.4: + * Fixed the interactive mode, in connection with Configure + contexts + * Fix EnsureSConsVersion warning when running packaged version + * Fix D tools for building shared libraries + ------------------------------------------------------------------- Mon Sep 29 12:43:29 UTC 2014 - tchvatal@suse.com diff --git a/scons.spec b/scons.spec index edf7d63..0b03ba3 100644 --- a/scons.spec +++ b/scons.spec @@ -22,7 +22,7 @@ %{!?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 +Version: 2.3.4 Release: 0 Summary: Replacement for Make License: MIT From a97fbb8a94e4ad6cc5350b77fe7efe0896af0309c3c848a5e3338b7832151362 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sun, 5 Oct 2014 19:08:16 +0000 Subject: [PATCH 3/4] Accepting request 254055 from home:AndreasStieger:branches:devel:tools:building fix SLE 11 SP3 python reqs for serf OBS-URL: https://build.opensuse.org/request/show/254055 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=32 --- scons.changes | 3 ++- scons.spec | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scons.changes b/scons.changes index f0437ac..e391923 100644 --- a/scons.changes +++ b/scons.changes @@ -1,11 +1,12 @@ ------------------------------------------------------------------- -Sun Oct 5 14:55:49 UTC 2014 - andreas.stieger@gmx.de +Sun Oct 5 19:02:31 UTC 2014 - andreas.stieger@gmx.de - SCons 2.3.4: * Fixed the interactive mode, in connection with Configure contexts * Fix EnsureSConsVersion warning when running packaged version * Fix D tools for building shared libraries +- for SLE 11 SP3, make package noarch and fix python requirements ------------------------------------------------------------------- Mon Sep 29 12:43:29 UTC 2014 - tchvatal@suse.com diff --git a/scons.spec b/scons.spec index 0b03ba3..9ec7f4a 100644 --- a/scons.spec +++ b/scons.spec @@ -39,8 +39,9 @@ Patch1: %{name}-1.2.0-noenv.patch BuildRequires: fdupes BuildRequires: python-devel >= 2.4 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1110 BuildArch: noarch +%if 0%{?suse_version} == 1110 +%{py_requires} %endif %description From dd3e7ba88a264d9a34de1fe5e77f6923dd86a56e9707a08753afd847482dfae9 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Sun, 5 Oct 2014 19:42:02 +0000 Subject: [PATCH 4/4] fix SLE 11 x86_64 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=33 --- scons.changes | 4 ++-- scons.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scons.changes b/scons.changes index e391923..1be3713 100644 --- a/scons.changes +++ b/scons.changes @@ -1,12 +1,12 @@ ------------------------------------------------------------------- -Sun Oct 5 19:02:31 UTC 2014 - andreas.stieger@gmx.de +Sun Oct 5 19:37:22 UTC 2014 - andreas.stieger@gmx.de - SCons 2.3.4: * Fixed the interactive mode, in connection with Configure contexts * Fix EnsureSConsVersion warning when running packaged version * Fix D tools for building shared libraries -- for SLE 11 SP3, make package noarch and fix python requirements +- for SLE 11 SP3 fix python requirements ------------------------------------------------------------------- Mon Sep 29 12:43:29 UTC 2014 - tchvatal@suse.com diff --git a/scons.spec b/scons.spec index 9ec7f4a..4cfe5b7 100644 --- a/scons.spec +++ b/scons.spec @@ -39,7 +39,9 @@ Patch1: %{name}-1.2.0-noenv.patch BuildRequires: fdupes BuildRequires: python-devel >= 2.4 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1110 BuildArch: noarch +%endif %if 0%{?suse_version} == 1110 %{py_requires} %endif