rpms/sip/F-7 sip-4.7-64bit.patch,NONE,1.1 sip.spec,1.36,1.37
Than Ngo (than)
fedora-extras-commits at redhat.com
Mon Oct 1 10:23:29 UTC 2007
Author: than
Update of /cvs/extras/rpms/sip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20008
Modified Files:
sip.spec
Added Files:
sip-4.7-64bit.patch
Log Message:
fix rh#289321, sipconfig.py includes wrong py_lib_dir, thanks to Rex Dieter
sip-4.7-64bit.patch:
--- NEW FILE sip-4.7-64bit.patch ---
diff -up sip-4.7/configure.py.64bit sip-4.7/configure.py
--- sip-4.7/configure.py.64bit 2007-07-30 11:02:37.000000000 -0500
+++ sip-4.7/configure.py 2007-09-28 09:47:08.000000000 -0500
@@ -17,6 +17,7 @@ import os
import string
import glob
import getopt
+from distutils.sysconfig import get_python_lib
import siputils
@@ -229,13 +230,9 @@ def set_platform_directories():
try:
lib_dir = sys.lib
except AttributeError:
- lib_dir = "lib"
+ lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
- lib_dir = sys.prefix + "/" + lib_dir + "/python" + vers
-
- plat_py_site_dir = lib_dir
- if py_version >= 0x020000:
- plat_py_site_dir = plat_py_site_dir + "/site-packages"
+ plat_py_site_dir = get_python_lib(1)
plat_py_inc_dir = sys.prefix + "/include/python" + vers
plat_py_conf_inc_dir = sys.exec_prefix + "/include/python" + vers
Index: sip.spec
===================================================================
RCS file: /cvs/extras/rpms/sip/F-7/sip.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sip.spec 12 Apr 2007 10:28:17 -0000 1.36
+++ sip.spec 1 Oct 2007 10:22:57 -0000 1.37
@@ -7,13 +7,15 @@
Summary: SIP - Python/C++ Bindings Generator
Name: sip
Version: 4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Development/Tools
Url: http://www.riverbankcomputing.co.uk/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-%{version}.tar.gz
+Patch: sip-4.7-64bit.patch
+
BuildRequires: python-devel
BuildRequires: %{qtpkg}-devel >= %{qtver}
BuildRequires: sed
@@ -42,6 +44,7 @@
%prep
%setup -q
+%patch -p1 -b .64bit
%build
QTDIR="" && source /etc/profile.d/qt.sh
@@ -82,6 +85,9 @@
%{_includedir}/python?.?/*
%changelog
+* Mon Oct 01 2007 Than Ngo <than at redhat.com> - 4.6-2
+- fix rh#289321, sipconfig.py includes wrong py_lib_dir, thanks to Rex Dieter
+
* Thu Apr 12 2007 Than Ngo <than at redhat.com> - 4.6-1.fc7
- 4.6
More information about the fedora-extras-commits
mailing list