diff --git a/scons-3.0.1.tar.gz b/scons-3.0.1.tar.gz
deleted file mode 100644
index 46d790b71279ce9cd7848c841a5d31209fe02386..0000000000000000000000000000000000000000
Binary files a/scons-3.0.1.tar.gz and /dev/null differ
diff --git a/scons-3.1.1.tar.gz b/scons-3.1.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6eb3f0208212ad3b0cd85121063691121062d526
Binary files /dev/null and b/scons-3.1.1.tar.gz differ
diff --git a/scons-doc-3.1.1.tar.gz b/scons-doc-3.1.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..215264e7062b0dd04a5cb68c5d7a17fd4b6fe092
Binary files /dev/null and b/scons-doc-3.1.1.tar.gz differ
diff --git a/scons.spec b/scons.spec
index 2d111d24aa6ffe64296129288d67ffedd2cd6021..8dd2228f22d539d591b19508ddd0aa06d4074115 100644
--- a/scons.spec
+++ b/scons.spec
@@ -1,146 +1,167 @@
-%global _description\
-SCons is an Open Source software construction tool—that is, a next-generation \
-build tool. Think of SCons as an improved, cross-platform substitute for the \
-classic Make utility with integrated functionality similar to autoconf/automake \
-and compiler caches such as ccache. In short, SCons is an easier, more reliable \
+Name:          scons
+Version:       3.1.1
+Release:       2
+Summary:       An Open Source software construction tool
+License:       MIT
+URL:           http://www.scons.org
+Source0:       https://github.com/SCons/scons/archive/scons-%{version}.tar.gz
+Source1:       https://scons.org/doc/%{version}/scons-doc-%{version}.tar.gz
+BuildArch:     noarch
+
+%description
+SCons is an Open Source software construction tool—that is, a next-generation
+build tool. Think of SCons as an improved, cross-platform substitute for the
+classic Make utility with integrated functionality similar to autoconf/automake
+and compiler caches such as ccache. In short, SCons is an easier, more reliable
 and faster way to build software.
 
-Name:               scons
-Version:            3.0.1
-Release:            10
-Summary:            A software construction tool
-License:            MIT
-URL:                http://www.scons.org
-Source:             http://prdownloads.sourceforge.net/scons/scons-%{version}.tar.gz
+%package        doc
+Summary:        An Open Source software construction tool
+BuildArch:      noarch
 
-BuildArch:          noarch
+%description    doc
+Scons HTML documentation.
 
-%description %_description
+%package -n     python2-%{name}
+Summary:        An Open Source software construction tool
+BuildRequires:  python2-devel
+%{?python_provide:%python_provide python2-%{name}}
+Provides:      scons-python2 = 0:%{version}-%{release}
 
-%package     -n     python2-scons
-Summary:            A software construction tool
-BuildRequires:      python2-devel
-Provides:           scons = %{version}-%{release}
-Obsoletes:          scons < 3.0.1-4
-%{?python_provide:%python_provide python2-scons}
-
-%description -n python2-scons %_description
+%description -n python2-%{name}
+SCons is an Open Source software construction tool—that is, a next-generation
+build tool. Think of SCons as an improved, cross-platform substitute for the
+classic Make utility with integrated functionality similar to autoconf/automake
+and compiler caches such as ccache. In short, SCons is an easier, more reliable
+and faster way to build software.
 
+%package -n     python3-%{name}
+Summary:        An Open Source software construction tool
 
-%package     -n     python3-scons
-Summary:            A software construction tool
-BuildRequires:      python3-devel
-Provides:           scons-python3 = %{version}-%{release}
+BuildRequires:  python3-devel
+Provides:       scons = 0:%{version}-%{release}
+Provides:       scons-python3
+Obsoletes:      scons < 0:5.0.3-3
 %{?python_provide:%python_provide python3-%{name}}
 
-%description -n python3-scons %_description
+%description -n python3-%{name}
+SCons is an Open Source software construction tool—that is, a next-generation
+build tool. Think of SCons as an improved, cross-platform substitute for the
+classic Make utility with integrated functionality similar to autoconf/automake
+and compiler caches such as ccache. In short, SCons is an easier, more reliable
+and faster way to build software.
 
-%package            help
-Summary:            Documents for python-scons
-Buildarch:          noarch
+%prep
+%autosetup -c -a 1 -p1
 
-%description        help
-Man pages and other related documents.
+# Remove unused doc directories
+rm -rf PDF PS EPUB TEXT
 
-%prep
-%autosetup -p1 -c
+# Convert to UTF-8
+for file in %{name}-%{version}/src/*.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
 
 cp -a %{name}-%{version} %{name}-%{version}-py3
-sed -i 's|/usr/bin/env python|%{__python2}|' %{name}-%{version}/script/*
-sed -i 's|/usr/bin/env python|%{__python3}|' %{name}-%{version}-py3/script/*
+sed -i 's|/usr/bin/env python|%{__python2}|' %{name}-%{version}/bootstrap.py
+sed -i 's|/usr/bin/env python|%{__python2}|' %{name}-%{version}/src/script/*.py
+sed -i 's|/usr/bin/env python|%{__python3}|' %{name}-%{version}-py3/bootstrap.py
+sed -i 's|/usr/bin/env python|%{__python3}|' %{name}-%{version}-py3/src/script/*.py
 
 %build
-cd %{name}-%{version}
-%py2_build
-cd -
-cd %{name}-%{version}-py3
-%py3_build
-cd -
+pushd %{name}-%{version}-py3
+%{__python3} bootstrap.py --bootstrap_dir=build/scons
+popd
+
+pushd %{name}-%{version}
+%{__python2} bootstrap.py --bootstrap_dir=build/scons
+popd
 
 %install
-cd %{name}-%{version}-py3
-%py3_install \
---standard-lib \
---install-scripts=%{_bindir} \
---install-data=%{_datadir} \
---no-install-bat \
---no-version-script
-cd ..
-
-pushd %{buildroot}%{_bindir}
-mv %{name} %{name}-3
-mv %{name}-configure-cache %{name}-configure-cache-3
-mv %{name}ign %{name}ign-3
-mv %{name}-time %{name}-time-3
-
-for link in %{name}-v%{version}-%{python3_version} \
-%{name}-%{python3_version}; do
-  ln -fs %{_bindir}/%{name}-3 $link
+pushd %{name}-%{version}/build/scons
+%py2_install \
+ --standard-lib --no-install-bat --no-version-script \
+ --install-scripts=%{_bindir} --install-data=%{_datadir}
+popd
+
+mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-2
+mv %{buildroot}%{_bindir}/%{name}-configure-cache %{buildroot}%{_bindir}/%{name}-configure-cache-2
+mv %{buildroot}%{_bindir}/%{name}ign %{buildroot}%{_bindir}/%{name}ign-2
+mv %{buildroot}%{_bindir}/%{name}-time %{buildroot}%{_bindir}/%{name}-time-2
+
+pushd %{buildroot}%{_bindir} 
+for i in %{name}-%{python2_version} %{name}-v%{version}-%{python2_version}; do
+  ln -fs %{_bindir}/%{name}-2 %{buildroot}%{_bindir}/$i
 done
-for link in %{name}ign-v%{version}-%{python3_version} \
-%{name}ign-%{python3_version}; do
-  ln -fs %{_bindir}/%{name}ign-3 $link
+for i in %{name}ign-%{python2_version} %{name}ign-v%{version}-%{python2_version}; do
+  ln -fs %{_bindir}/%{name}ign-2 %{buildroot}%{_bindir}/$i
 done
-for link in %{name}-time-v%{version}-%{python3_version} \
-%{name}-time-%{python3_version}; do
-  ln -fs %{_bindir}/%{name}-time-3 $link
+for i in %{name}-time-%{python2_version} %{name}-time-v%{version}-%{python2_version}; do
+  ln -fs %{_bindir}/%{name}-time-2 %{buildroot}%{_bindir}/$i
 done
-for link in %{name}-configure-cache-v%{version}-%{python3_version} \
-%{name}-configure-cache-%{python3_version}; do
-  ln -fs %{_bindir}/%{name}-configure-cache-3 $link
+for i in %{name}-configure-cache-%{python2_version} %{name}-configure-cache-v%{version}-%{python2_version}; do
+  ln -fs %{_bindir}/%{name}-configure-cache-2 %{buildroot}%{_bindir}/$i
 done
 popd
 
-cd %{name}-%{version}
-%py2_install \
---standard-lib \
---no-install-bat \
---no-version-script \
---install-scripts=%{_bindir} \
---install-data=%{_datadir}
-cd ..
-
-pushd %{buildroot}%{_bindir}
-for link in %{name}-2 %{name}-%{python2_version} \
-%{name}-v%{version}-%{python2_version}; do
-  ln -fs %{_bindir}/%{name} $link
+pushd %{name}-%{version}-py3/build/scons
+%py3_install \
+ --standard-lib --no-install-bat --no-version-script \
+ --install-scripts=%{_bindir} --install-data=%{_datadir}
+popd
+pushd %{buildroot}%{_bindir} 
+for i in %{name}-3 %{name}-v%{version}-%{python3_version} %{name}-%{python3_version}; do
+  ln -fs %{_bindir}/%{name} %{buildroot}%{_bindir}/$i
 done
-for link in %{name}ign-2 %{name}ign-%{python2_version} \
-%{name}ign-v%{version}-%{python2_version}; do
-  ln -fs %{_bindir}/%{name}ign $link
+for i in %{name}ign-3 %{name}ign-v%{version}-%{python3_version} %{name}ign-%{python3_version}; do
+  ln -fs %{_bindir}/%{name}ign %{buildroot}%{_bindir}/$i
 done
-for link in %{name}-time-2 %{name}-time-%{python2_version} \
-%{name}-time-v%{version}-%{python2_version}; do
-  ln -fs %{_bindir}/%{name}-time $link
+for i in %{name}-time-3 %{name}-time-v%{version}-%{python3_version} %{name}-time-%{python3_version}; do
+  ln -fs %{_bindir}/%{name}-time %{buildroot}%{_bindir}/$i
 done
-for link in %{name}-configure-cache-2 %{name}-configure-cache-%{python2_version} \
-%{name}-configure-cache-v%{version}-%{python2_version}; do
-  ln -fs %{_bindir}/%{name}-configure-cache $link
+for i in %{name}-configure-cache-3 %{name}-configure-cache-v%{version}-%{python3_version} %{name}-configure-cache-%{python3_version}; do
+  ln -fs %{_bindir}/%{name}-configure-cache %{buildroot}%{_bindir}/$i
 done
 popd
 
-%files -n python2-scons
-%license %{name}-%{version}/LICENSE.txt
-%{_bindir}/%{name}
-%{_bindir}/%{name}ign
-%{_bindir}/%{name}-time
-%{_bindir}/%{name}-configure-cache
+%check
+pushd %{name}-%{version}-py3
+%{__python3} runtest.py -P %{__python3} --passed --quit-on-failure src/engine/SCons/BuilderTests.py
+popd
+
+pushd %{name}-%{version}
+%{__python2} runtest.py  -P %{__python2} --passed --quit-on-failure src/engine/SCons/BuilderTests.py
+popd
+
+%files -n python2-%{name}
+%doc %{name}-%{version}/src/CHANGES.txt %{name}-%{version}/src/README.txt %{name}-%{version}/src/RELEASE.txt
+%license %{name}-%{version}/src/LICENSE.txt
 %{_bindir}/%{name}*-2
 %{_bindir}/%{name}*-%{python2_version}
 %{python2_sitelib}/SCons/
 %{python2_sitelib}/scons-%{version}*.egg-info
+%{_mandir}/man?/*
 
 %files -n python3-%{name}
-%license %{name}-%{version}-py3/LICENSE.txt
+%doc %{name}-%{version}-py3/src/CHANGES.txt %{name}-%{version}-py3/src/README.txt %{name}-%{version}-py3/src/RELEASE.txt
+%license %{name}-%{version}-py3/src/LICENSE.txt
 %{_bindir}/%{name}*-3
+%{_bindir}/%{name}
+%{_bindir}/%{name}{ign,-time,-configure-cache}
 %{_bindir}/%{name}*-%{python3_version}
 %{python3_sitelib}/SCons/
 %{python3_sitelib}/scons-%{version}*.egg-info
-
-%files help
-%doc %{name}-%{version}/{CHANGES,README,RELEASE}.txt
 %{_mandir}/man?/*
 
+%files doc
+%doc HTML
+%license %{name}-%{version}/src/LICENSE.txt
+
 %changelog
+* Thu Jun 4 2020 Captain Wei <captain.a.wei@gmail.com> - 3.1.1-2
+- update package version
+
 * Sat Nov 30 2019 zhouyihang <zhouyihang1@huawei.com> - 3.0.1-10
 - Package init
diff --git a/scons.yaml b/scons.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9a24859c3cfcdad7e0331fa77fc6af5f3a78068b
--- /dev/null
+++ b/scons.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: SCons/scons
+tag_pattern: ^v
+seperator: .