diff --git a/scons-1.2.0.d20100117.tar.bz2 b/scons-1.2.0.d20100117.tar.bz2 deleted file mode 100644 index ad7ed67..0000000 --- a/scons-1.2.0.d20100117.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0e6c9edc4f22264bbd194fe704c37f32e4e9d322cfed5f9e167ad2c397569af -size 467462 diff --git a/scons-2.1.0.tar.gz b/scons-2.1.0.tar.gz new file mode 100644 index 0000000..cbd9a57 --- /dev/null +++ b/scons-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4139ed14f60dd2ebcd47c59984d14705636180eb27b3d1b2949489e514b1921d +size 574666 diff --git a/scons-rpmlintrc b/scons-rpmlintrc new file mode 100644 index 0000000..2c6475b --- /dev/null +++ b/scons-rpmlintrc @@ -0,0 +1,4 @@ +# Source URL pointed to upstream release, tar.gz +addFilter("W: source-or-patch-not-bzipped") +# It's not really an extension/module (is it?) +addFilter("W: python-naming-policy-not-applied") diff --git a/scons.changes b/scons.changes index 7376050..842e7f7 100644 --- a/scons.changes +++ b/scons.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Tue Oct 11 22:52:27 UTC 2011 - nmarques@opensuse.org + + +- SCons 2.1.0 requires py_abi > 2.4 +- Potential build fix for SLE11, SLE11_SP1 + + add python_sitearch/python_sitelib macros for <= 1120 + + improved source URL + + add comment for patch +- Add scons-rpmlintrc: source-or-patch-not-bzipped, + python-naming-policy-not-applied + +------------------------------------------------------------------- +Tue Oct 11 16:05:12 UTC 2011 - nmarques@opensuse.org + +- Update to 2.1.0: + + Fix Windows resource compiler scanner to accept DOS line + endings. + + Update MSVS documents to remove note indicating that only one + project is currently supported per solution file. + + Fix long compile lines in batch mode by using TEMPFILE + + Fix MSVC_BATCH=False (was treating it as true) + + support -std=c++0x and related CXXFLAGS in pkgconfig + (ParseFlags) + + Support -dylib_file in pkgconfig (ParseFlags) + + new construction variable WINDOWS_EMBED_MANIFEST to + automatically embed manifests in Windows EXEs and DLLs. + + Fix Visual Studio project generation when CPPPATH contains Dir nodes + + Ensure Visual Studio project is regenerated when CPPPATH or + CPPDEFINES change + + Fix unicode error when using non-ASCII filenames with Copy or + Install + + Put RPATH in LINKCOM rather than LINKFLAGS so resetting + LINKFLAGS doesn't kill RPATH + + Fix precompiled headers on Windows when variant dir name has + spaces. + + Adding None to an Action no longer fails (just returns original + action) + + New --debug=prepare option to show each target as it's being + prepared, whether or not anything needs to be done for it. + + New debug option --debug=duplicate to print a line for each + unlink/relink (or copy) of a variant file from its source + file. + + Improve error message for EnumVariables to show legal values. + + Fix Intel compiler to sort versions >9 correctly (esp. on + Linux) + + Fix Install() when the source and target are directories and + the target directory exists. + + Many more, please see ChangeLog/Changes. + ------------------------------------------------------------------- Wed Feb 10 18:50:20 UTC 2010 - davejplater@gmail.com diff --git a/scons.spec b/scons.spec index c8acfa7..fd22ed8 100644 --- a/scons.spec +++ b/scons.spec @@ -1,7 +1,7 @@ # -# spec file for package scons (Version 1.2.0) +# spec file for package scons # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,22 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +# 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))")} +%endif Name: scons Summary: Replacement for Make -Version: 1.2.0 -Release: 2 -%define fullversion %{version}.d20100117 -Source0: %{name}-%{fullversion}.tar.bz2 +Version: 2.1.0 +Release: 1 +Source0: http://freefr.dl.sourceforge.net/project/scons/scons/%{version}/%{name}-%{version}.tar.gz Source1: scons-user.html -Patch0: %{name}-%{version}-fix-install.patch -Patch1: %{name}-%{version}-noenv.patch +# rpmlintrc +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 BuildRequires: python-devel %{py_requires} @@ -41,21 +48,8 @@ support. SCons rule sets are Python scripts, which means that SCons provides itself as well as the features. SCons allows you to use the full power of Python to control compilation. - - -Authors: --------- - Steven Knight - Chad Austin - Charles Crain - Steve Leblanc - Gary Oberbrunner - Anthony Roach - Greg Spencer - Christoph Wiedemann - %prep -%setup -q -n %{name}-%{fullversion} +%setup -q %patch0 %patch1 # fix libdir for qt @@ -74,21 +68,15 @@ export CFLAGS="$RPM_OPT_FLAGS" python setup.py build %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{py_sitedir} --record-rpm=INSTALLED_FILES -# fix duplicates in bindir -ln -sf scons $RPM_BUILD_ROOT%{_bindir}/scons-%{fullversion} -ln -sf scons-time $RPM_BUILD_ROOT%{_bindir}/scons-time-%{fullversion} -ln -sf sconsign $RPM_BUILD_ROOT%{_bindir}/sconsign-%{fullversion} -# fix manpages -for prg in scons scons-time sconsign; do - sed -i "s@%{_mandir}/man1/$prg.1@%{_mandir}/man1/$prg.1.gz@" INSTALLED_FILES -done +python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-lib=%{py_sitedir} +%fdupes %{buildroot}%{_bindir} -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f INSTALLED_FILES +%files %defattr(-,root,root) %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html +%{_bindir}/* +%{python_sitearch}/SCons/ +%{python_sitearch}/*.egg-info +%{_mandir}/man1/*.gz %changelog