Revert "change support python version"tizen_6.5.m2_releasesubmit/tizen_base/20211231.095324submit/tizen_base/20211115.044027submit/tizen_base/20210528.045627submit/tizen_6.5_base/20211028.133901accepted/tizen/base/20211231.100158accepted/tizen/base/20211115.045802accepted/tizen/base/20210531.023635accepted/tizen/6.5/base/20211028.055348tizen_6.5_basesandbox/backup/boost-1.71.0-20211110accepted/tizen_6.5_base

This reverts commit 4e164fa35cacb425e77cb5989a76540949bf02e0.

Change-Id: I23065f365b0483365d5bbf711697a8ae4cfd4ec8
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 11 insertions, 23 deletions

diff --git a/packaging/boost.spec b/packaging/boost.spec
index 4f8b6ded4e..901f0d7e2f 100644
--- a/packaging/boost.spec
+++ b/packaging/boost.spec
@@ -16,7 +16,7 @@
 
 %define boost_libs1 boost-date-time boost-filesystem boost-graph
 %define boost_libs2 boost-iostreams boost-math boost-test
-%define boost_libs3 boost-program-options boost-python3 boost-serialization
+%define boost_libs3 boost-program-options boost-python boost-serialization
 %define boost_libs4 boost-system boost-thread
 %define boost_libs5 boost-wave boost-regex boost-contract
 %define boost_libs6 boost-random boost-chrono boost-locale
@@ -57,7 +57,8 @@ BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  libicu-devel
-BuildRequires:  pkgconfig(python3)
+BuildRequires:  python
+BuildRequires:  python-devel
 BuildRequires:  xz
 BuildRequires:  fdupes
 Url:            http://www.boost.org
@@ -274,13 +275,13 @@ Provides:       boost-program-options
 This package contains the Boost::ProgramOptions Runtime libraries.
 
 
-%package     -n boost-python3
+%package     -n boost-python
 Summary:        Boost::Python Runtime Libraries
 Group:          System/Libraries
 Requires:       boost-license
-Provides:       boost-python3
+Provides:       boost-python
 
-%description -n boost-python3
+%description -n boost-python
 This package contains the Boost::Python Runtime libraries.
 
 %package     -n boost-serialization
@@ -416,8 +417,8 @@ fi
 export LONG_DOUBLE_FLAGS="--disable-long-double"
 %endif
 BJAM_CONFIG="-d2 -j$JOBS -sICU_PATH=%{_prefix}"
-PYTHON_VERSION=$(python3 -c 'import sys; print (sys.version[:3])')
-PYTHON_FLAGS=" --with-python-root=/usr/lib/python${PYTHON_VERSION} --with-python-version=${PYTHON_VERSION}"
+PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
+PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION"
 export REGEX_FLAGS="--with-icu"
 export EXPAT_INCLUDE=/usr/include EXPAT_LIBPATH=%{_libdir}
 export PYTHON_FLAGS
@@ -470,19 +471,6 @@ using mpi ;
 EOF
 %endif
 
-
-cat << EOF >>user-config.jam
-
-using python
-    : ${PYTHON_VERSION}
-    : /usr/bin/python3
-    : %{_includedir}/python${PYTHON_VERSION}m
-    :
-    :
-    ;
-
-EOF
-
 # perform the compilation
 ./b2 %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} \
     --user-config=./user-config.jam ${CFLAGS:+cflags="$CFLAGS"} \
@@ -579,7 +567,7 @@ rm -rf %{buildroot}%{_libdir}/cmake
 %post -n boost-log -p /sbin/ldconfig
 %post -n boost-test -p /sbin/ldconfig
 %post -n boost-program-options -p /sbin/ldconfig
-%post -n boost-python3 -p /sbin/ldconfig
+%post -n boost-python -p /sbin/ldconfig
 %post -n boost-regex -p /sbin/ldconfig
 %post -n boost-serialization -p /sbin/ldconfig
 %post -n boost-thread -p /sbin/ldconfig
@@ -619,7 +607,7 @@ rm -rf %{buildroot}%{_libdir}/cmake
 %postun -n boost-log -p /sbin/ldconfig
 %postun -n boost-test -p /sbin/ldconfig
 %postun -n boost-program-options -p /sbin/ldconfig
-%postun -n boost-python3 -p /sbin/ldconfig
+%postun -n boost-python -p /sbin/ldconfig
 %postun -n boost-regex -p /sbin/ldconfig
 %postun -n boost-serialization -p /sbin/ldconfig
 %postun -n boost-thread -p /sbin/ldconfig
@@ -759,7 +747,7 @@ rm -rf %{buildroot}%{_libdir}/cmake
 %license LICENSE_1_0.txt
 %{_libdir}/libboost_program_options*.so.*
 
-%files -n boost-python3
+%files -n boost-python
 %manifest %{name}.manifest
 %defattr(-, root, root, -)
 %license LICENSE_1_0.txt