- Fix the testsuite pass to keep working
- Use regular python macros - Use fdupes OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=78
This commit is contained in:
parent
903320d335
commit
1242be14fe
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 25 09:32:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Fix the testsuite pass to keep working
|
||||||
|
- Use regular python macros
|
||||||
|
- Use fdupes
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 1 19:44:24 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
|
Fri Mar 1 19:44:24 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||||
|
|
||||||
|
17
scons.spec
17
scons.spec
@ -22,10 +22,13 @@
|
|||||||
# https://pairlist4.pair.net/pipermail/scons-users/2018-October/007311.html
|
# https://pairlist4.pair.net/pipermail/scons-users/2018-October/007311.html
|
||||||
%ifnarch aarch64 armv7l ppc64 ppc64le s390x
|
%ifnarch aarch64 armv7l ppc64 ppc64le s390x
|
||||||
%if "%{flavor}" == "test"
|
%if "%{flavor}" == "test"
|
||||||
|
%define psuffix -test
|
||||||
%bcond_without test
|
%bcond_without test
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
%define psuffix %{nil}
|
||||||
%bcond_with test
|
%bcond_with test
|
||||||
|
Name: scons%{psuffix}
|
||||||
Version: 3.0.4
|
Version: 3.0.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Replacement for Make
|
Summary: Replacement for Make
|
||||||
@ -39,17 +42,13 @@ Source1: scons-user.html-%{version}.tar.bz2
|
|||||||
Source2: grep-filter-list.txt
|
Source2: grep-filter-list.txt
|
||||||
# Local modification
|
# Local modification
|
||||||
Patch8: scons-3.0.0-fix-install.patch
|
Patch8: scons-3.0.0-fix-install.patch
|
||||||
|
BuildRequires: fdupes
|
||||||
BuildRequires: grep
|
BuildRequires: grep
|
||||||
BuildRequires: python3-base >= 3.5
|
BuildRequires: python3-base >= 3.5
|
||||||
BuildRequires: python3-lxml
|
BuildRequires: python3-lxml
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
Requires: python3-base >= 3.5
|
Requires: python3-base >= 3.5
|
||||||
%if %{with test}
|
%if %{with test}
|
||||||
Name: %{modname}-%{flavor}
|
|
||||||
%else
|
|
||||||
Name: %{modname}
|
|
||||||
%endif
|
|
||||||
%if %{with test}
|
|
||||||
# texlive texlive-latex3 biber texmaker ghostscript
|
# texlive texlive-latex3 biber texmaker ghostscript
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -88,21 +87,25 @@ sed -i 's|%{_bindir}/env python|%{_bindir}/python3|' src/script/*
|
|||||||
cp %{SOURCE2} grep-filter-list.txt
|
cp %{SOURCE2} grep-filter-list.txt
|
||||||
chmod -x src/CHANGES.txt README.rst src/RELEASE.txt
|
chmod -x src/CHANGES.txt README.rst src/RELEASE.txt
|
||||||
|
|
||||||
|
# the test is marked skipped but fails
|
||||||
|
rm test/MSVS/vs-14.1-exec.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
python3 bootstrap.py build/scons
|
python3 bootstrap.py build/scons
|
||||||
cd build/scons
|
cd build/scons
|
||||||
%{py3_build}
|
%python3_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if !%{with test}
|
%if !%{with test}
|
||||||
cd build/scons
|
cd build/scons
|
||||||
ls -lh build/lib
|
ls -lh build/lib
|
||||||
%{py3_install} \
|
%python3_install \
|
||||||
--standard-lib \
|
--standard-lib \
|
||||||
--no-install-bat \
|
--no-install-bat \
|
||||||
--no-version-script \
|
--no-version-script \
|
||||||
--install-scripts=%{_bindir} \
|
--install-scripts=%{_bindir} \
|
||||||
--record installed_files.txt
|
--record installed_files.txt
|
||||||
|
%fdupes %{buildroot}%{python3_sitelib}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
Loading…
Reference in New Issue
Block a user