From 62eee62abedbc59a67ae4517d855ac0969dbeac9 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Oct 01 2007 10:22:57 +0000
Subject: fix rh#289321, sipconfig.py includes wrong py_lib_dir, thanks to Rex Dieter


---

diff --git a/sip-4.7-64bit.patch b/sip-4.7-64bit.patch
new file mode 100644
index 0000000..c5bc797
--- /dev/null
+++ b/sip-4.7-64bit.patch
@@ -0,0 +1,27 @@
+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
diff --git a/sip.spec b/sip.spec
index 7ad680a..8e6d39f 100644
--- a/sip.spec
+++ b/sip.spec
@@ -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 @@ classes library.
 %prep
 
 %setup -q
+%patch -p1 -b .64bit
 
 %build
 QTDIR="" && source /etc/profile.d/qt.sh
@@ -82,6 +85,9 @@ rm -rf %{buildroot}
 %{_includedir}/python?.?/*
 
 %changelog
+* Mon Oct 01 2007 Than Ngo <than@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@redhat.com> - 4.6-1.fc7
 - 4.6