diff --git a/python-macros.python b/python-macros.python index a50772c..d7782ad 100644 --- a/python-macros.python +++ b/python-macros.python @@ -13,6 +13,7 @@ # %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") %python_version %(%{__python} -c "import sys; print(sys.version[0:3])") %py_compile(O) \ diff --git a/python27.spec b/python27.spec index 102f000..395d161 100644 --- a/python27.spec +++ b/python27.spec @@ -6,7 +6,7 @@ #% define __libdir %{_prefix}/lib %define __libdir %{_libdir} Name: python27 -Version: 2.7.15 +Version: 2.7.16 Release: 1mamba Summary: An interpreted, interactive, object-oriented programming language Group: Applications/Development @@ -226,21 +226,22 @@ ln -s python%{majversion} %{buildroot}%{_includedir}/python # fix library permission chmod 755 %{buildroot}%{__libdir}/libpython%{majversion}.so.* -%if "%{stage1}" != "1" -# build the HTML documentation -cd Doc - -###sed -i s@/usr/bin/env@/bin/env@ tools/mkhowto -PATH=$PATH:%{_builddir}/Python-%{version}/Doc/tools -make html - -install -d %{buildroot}%{_defaultdocdir}/%{name}-%{version} -cp -R build/html build/doctrees %{buildroot}%{_defaultdocdir}/%{name}-%{version} -rm -f 'find %{buildroot}%{_defaultdocdir}/%{name}-%{version}/html/.cvsignore' - -cd .. +#% if "%{stage1}" != "1" +## build the HTML documentation +#cd Doc +# +####sed -i s@/usr/bin/env@/bin/env@ tools/mkhowto +#PATH=$PATH:%{_builddir}/Python-%{version}/Doc/tools +#make html +# +#install -d %{buildroot}%{_defaultdocdir}/%{name}-%{version} +#cp -R build/html build/doctrees %{buildroot}%{_defaultdocdir}/%{name}-%{version} +#rm -f 'find %{buildroot}%{_defaultdocdir}/%{name}-%{version}/html/.cvsignore' +# +#cd .. #make PAPER=a4 pdf -%endif +#% endif + install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.python%{majversion} install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.python @@ -349,16 +350,20 @@ exit 0 #%{__libdir}/python%{majversion}/lib-tk %{__libdir}/python%{majversion}/lib-dynload/_tkinter.so -%files doc -%defattr(-,root,root) -%dir %{_defaultdocdir}/%{name}-%{version}/html/ -%{_defaultdocdir}/%{name}-%{version}/html/* -%{_defaultdocdir}/%{name}-%{version}/html/.buildinfo -%dir %{_defaultdocdir}/%{name}-%{version}/doctrees -%{_defaultdocdir}/%{name}-%{version}/doctrees/* -%endif +#%files doc +#%defattr(-,root,root) +#%dir %{_defaultdocdir}/%{name}-%{version}/html/ +#%{_defaultdocdir}/%{name}-%{version}/html/* +#%{_defaultdocdir}/%{name}-%{version}/html/.buildinfo +#%dir %{_defaultdocdir}/%{name}-%{version}/doctrees +#%{_defaultdocdir}/%{name}-%{version}/doctrees/* +#%endif %changelog +* Tue Jul 16 2019 Silvan Calarco 2.7.16-1mamba +- update to 2.7.16 +- add missing python_inc in macros.python + * Thu Sep 06 2018 Silvan Calarco 2.7.15-1mamba - update to 2.7.15