Drop main_python macro and the conditionals using it as it is not required anymore.
This commit is contained in:
parent
a7d311cd0a
commit
99c92afaf1
50
python.spec
50
python.spec
|
@ -4,19 +4,9 @@
|
|||
|
||||
%global with_rewheel 1
|
||||
|
||||
%{!?__python_ver:%global __python_ver EMPTY}
|
||||
#global __python_ver 27
|
||||
%global unicode ucs4
|
||||
|
||||
%if "%{__python_ver}" != "EMPTY"
|
||||
%global main_python 0
|
||||
%global python python%{__python_ver}
|
||||
%global tkinter tkinter%{__python_ver}
|
||||
%else
|
||||
%global main_python 1
|
||||
%global python python
|
||||
%global tkinter tkinter
|
||||
%endif
|
||||
|
||||
%global pybasever 2.7
|
||||
%global pylibdir %{_libdir}/python%{pybasever}
|
||||
|
@ -850,10 +840,6 @@ Requires: pkgconfig
|
|||
# Needed here because of the migration of Makefile from -devel to the main
|
||||
# package
|
||||
Conflicts: %{python} < %{version}-%{release}
|
||||
%if %{main_python}
|
||||
Provides: python2-devel = %{version}-%{release}
|
||||
Provides: python2-devel%{?_isa} = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
The Python programming language's interpreter can be extended with
|
||||
|
@ -871,9 +857,6 @@ Summary: A collection of development tools included with Python
|
|||
Group: Development/Tools
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{tkinter} = %{version}-%{release}
|
||||
%if %{main_python}
|
||||
Provides: python2-tools = %{version}
|
||||
%endif
|
||||
|
||||
%description tools
|
||||
This package includes several tools to help with the development of Python
|
||||
|
@ -884,9 +867,6 @@ color editor (pynche), and a python gettext program (pygettext.py).
|
|||
Summary: A graphical user interface for the Python scripting language
|
||||
Group: Development/Languages
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if %{main_python}
|
||||
Provides: tkinter2 = %{version}
|
||||
%endif
|
||||
|
||||
%description -n %{tkinter}
|
||||
|
||||
|
@ -1319,15 +1299,6 @@ mkdir %{buildroot}/%{pylibdir}/test
|
|||
cp -a save_bits_of_test/* %{buildroot}/%{pylibdir}/test
|
||||
fi
|
||||
|
||||
%if %{main_python}
|
||||
%else
|
||||
mv %{buildroot}%{_bindir}/python %{buildroot}%{_bindir}/%{python}
|
||||
%if 0%{?with_debug_build}
|
||||
mv %{buildroot}%{_bindir}/python-debug %{buildroot}%{_bindir}/%{python}-debug
|
||||
%endif # with_debug_build
|
||||
mv %{buildroot}/%{_mandir}/man1/python.1 %{buildroot}/%{_mandir}/man1/python%{pybasever}.1
|
||||
%endif
|
||||
|
||||
# tools
|
||||
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{site_packages}
|
||||
|
@ -1367,19 +1338,6 @@ find . -name ".cvsignore"|xargs rm -f
|
|||
#zero length
|
||||
rm -f %{buildroot}%{pylibdir}/LICENSE.txt
|
||||
|
||||
|
||||
#make the binaries install side by side with the main python
|
||||
%if !%{main_python}
|
||||
pushd %{buildroot}%{_bindir}
|
||||
mv idle idle%{__python_ver}
|
||||
mv pynche pynche%{__python_ver}
|
||||
mv pygettext.py pygettext%{__python_ver}.py
|
||||
mv msgfmt.py msgfmt%{__python_ver}.py
|
||||
mv smtpd.py smtpd%{__python_ver}.py
|
||||
mv pydoc pydoc%{__python_ver}
|
||||
popd
|
||||
%endif
|
||||
|
||||
# Fix for bug #136654
|
||||
rm -f %{buildroot}%{pylibdir}/email/test/data/audiotest.au %{buildroot}%{pylibdir}/test/audiotest.au
|
||||
|
||||
|
@ -1575,9 +1533,7 @@ rm -fr %{buildroot}
|
|||
%doc README
|
||||
%{_bindir}/pydoc*
|
||||
%{_bindir}/%{python}
|
||||
%if %{main_python}
|
||||
%{_bindir}/python2
|
||||
%endif
|
||||
%{_bindir}/python%{pybasever}
|
||||
%{_mandir}/*/*
|
||||
|
||||
|
@ -1746,10 +1702,8 @@ rm -fr %{buildroot}
|
|||
%{_includedir}/python%{pybasever}/*.h
|
||||
%exclude %{_includedir}/python%{pybasever}/%{_pyconfig_h}
|
||||
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
|
||||
%if %{main_python}
|
||||
%{_bindir}/python-config
|
||||
%{_bindir}/python2-config
|
||||
%endif
|
||||
%{_bindir}/python%{pybasever}-config
|
||||
%{_libdir}/libpython%{pybasever}.so
|
||||
|
||||
|
@ -1801,9 +1755,7 @@ rm -fr %{buildroot}
|
|||
|
||||
# Analog of the core subpackage's files:
|
||||
%{_bindir}/%{python}-debug
|
||||
%if %{main_python}
|
||||
%{_bindir}/python2-debug
|
||||
%endif
|
||||
%{_bindir}/python%{pybasever}-debug
|
||||
|
||||
# Analog of the -libs subpackage's files, with debug builds of the built-in
|
||||
|
@ -1901,10 +1853,8 @@ rm -fr %{buildroot}
|
|||
%{_libdir}/pkgconfig/python2-debug.pc
|
||||
%{pylibdir}/config-debug/*
|
||||
%{_includedir}/python%{pybasever}-debug/*.h
|
||||
%if %{main_python}
|
||||
%{_bindir}/python-debug-config
|
||||
%{_bindir}/python2-debug-config
|
||||
%endif
|
||||
%{_bindir}/python%{pybasever}-debug-config
|
||||
%{_libdir}/libpython%{pybasever}_d.so
|
||||
|
||||
|
|
Loading…
Reference in New Issue