diff --git a/wxPython.spec b/wxPython.spec index de54da4..28e130a 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -1,13 +1,12 @@ -%define pyver %(python -c 'import sys ; print sys.version[:3]') +# sitelib not sitearch, see build section +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPythonGTK2 Version: 2.4.2.4 -Release: 5 - +Release: 6 Summary: GUI toolkit for the Python programming language - Group: Development/Languages License: LGPL URL: http://www.wxpython.org/ @@ -17,7 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel >= 2.4.2, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: python-devel, wxGTK2-gl -Requires: %{_bindir}/python%{pyver} # This is what other packages should depend on, NOT the package name! Provides: wxPython = %{version}-%{release} @@ -57,11 +55,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{_libdir}/python%{pyver}/site-packages/wxPython -%{_libdir}/python%{pyver}/site-packages/wx +%{python_sitelib}/wxPython/ +%{python_sitelib}/wx/ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Wed May 11 2005 Michael Schwendt 2.4.2.4-6 +- rebuilt +- use %%python_sitelib macro +- drop dependency on python binary, python(abi) dependency is automatic + +* Thu Apr 7 2005 Michael Schwendt 2.4.2.4-5 - rebuilt * Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4