- Packaging changes:
* drop scons-3.0.0-support-python-2-prints.patch, now upstream * Restore python2 support for SLE 12 and Leap 42.x OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=53
This commit is contained in:
parent
67629dcac3
commit
45e141b412
@ -1,5 +1,5 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 15 15:42:30 UTC 2017 - astieger@suse.com
|
||||
Wed Nov 15 16:28:48 UTC 2017 - astieger@suse.com
|
||||
|
||||
- SCons 3.0.1:
|
||||
* Fix return value handling in to_String_for_subst()
|
||||
@ -10,7 +10,9 @@ Wed Nov 15 15:42:30 UTC 2017 - astieger@suse.com
|
||||
when using --debug=time.
|
||||
* Fix broken subst logic with "$$([...])"
|
||||
* Java/Jar building improvements and fixes
|
||||
- drop scons-3.0.0-support-python-2-prints.patch, now upstream
|
||||
- Packaging changes:
|
||||
* drop scons-3.0.0-support-python-2-prints.patch, now upstream
|
||||
* Restore python2 support for SLE 12 and Leap 42.x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 3 11:22:45 UTC 2017 - mpluskal@suse.com
|
||||
|
28
scons.spec
28
scons.spec
@ -16,6 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define with_python3 (0%{?suse_version} > 1320)
|
||||
Name: scons
|
||||
Version: 3.0.1
|
||||
Release: 0
|
||||
@ -29,8 +30,12 @@ Source1: scons-user.html-%{version}.tar.bz2
|
||||
# Sets _mandir to _datadir/man instead of _prefix/man
|
||||
Patch0: %{name}-3.0.0-fix-install.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python3-devel >= 3.5
|
||||
BuildArch: noarch
|
||||
%if %{with_python3}
|
||||
BuildRequires: python3-devel >= 3.5
|
||||
%else
|
||||
BuildRequires: python-devel >= 2.7
|
||||
%endif
|
||||
|
||||
%description
|
||||
SCons is a make replacement that provides a range of enhanced features,
|
||||
@ -52,20 +57,41 @@ patch -p0 <<EOF
|
||||
+ QT_LIBPATH = os.path.join('\$QTDIR', '%{_lib}'),
|
||||
EOF
|
||||
|
||||
%if %{with_python3}
|
||||
sed -i 's|%{_bindir}/env python|%{_bindir}/python3|' script/*
|
||||
%else
|
||||
sed -i 's|%{_bindir}/env python|%{_bindir}/python|' script/*
|
||||
%endif
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
%if %{with_python3}
|
||||
%python3_build
|
||||
%else
|
||||
python setup.py build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if %{with_python3}
|
||||
%python3_install
|
||||
%else
|
||||
python setup.py \install \
|
||||
--prefix=%{_prefix} \
|
||||
--root=%{buildroot} \
|
||||
--install-lib=%{python_sitelib} \
|
||||
--no-version-script
|
||||
%endif
|
||||
%fdupes %{buildroot}%{_bindir}
|
||||
|
||||
%files
|
||||
%doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html
|
||||
%{_bindir}/*
|
||||
%if %{with_python3}
|
||||
%{_libexecdir}/scons-%{version}
|
||||
%else
|
||||
%{python_sitelib}/SCons/
|
||||
%{python_sitelib}/*.egg-info
|
||||
%endif
|
||||
%{_mandir}/man1/*%{ext_man}
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user