rpms/sip/devel sip-4.7.4-64bit.patch,1.1,1.2 sip.spec,1.43,1.44

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/sip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29660

Modified Files:
	sip-4.7.4-64bit.patch sip.spec 
Log Message:
* Tue Feb 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.7.4-2
- fix 64bit patch


sip-4.7.4-64bit.patch:

Index: sip-4.7.4-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip-4.7.4-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sip-4.7.4-64bit.patch	12 Feb 2008 18:35:37 -0000	1.1
+++ sip-4.7.4-64bit.patch	12 Feb 2008 19:19:00 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up sip-4.7.4/configure.py.64bit sip-4.7.4/configure.py
 --- sip-4.7.4/configure.py.64bit	2008-02-12 07:53:33.000000000 -0600
-+++ sip-4.7.4/configure.py	2008-02-12 12:34:11.000000000 -0600
++++ sip-4.7.4/configure.py	2008-02-12 13:15:59.000000000 -0600
 @@ -212,7 +212,7 @@ def set_platform_directories():
      global plat_bin_dir, plat_py_lib_dir, plat_sip_dir
  
@@ -10,3 +10,14 @@
      plat_py_inc_dir = sysconfig.get_python_inc()
      plat_py_conf_inc_dir = os.path.dirname(sysconfig.get_config_h_filename())
  
+@@ -229,9 +229,7 @@ def set_platform_directories():
+         try:
+             lib_dir = sys.lib
+         except AttributeError:
+-            lib_dir = "lib"
+-
+-        lib_dir = sys.prefix + "/" + lib_dir + "/python" + vers
++            lib_dir = sysconfig.get_python_lib(plat_specific=1, standard_lib=1)
+ 
+         plat_py_lib_dir = lib_dir + "/config"
+         plat_bin_dir = sys.exec_prefix + "/bin"


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sip.spec	12 Feb 2008 18:35:37 -0000	1.43
+++ sip.spec	12 Feb 2008 19:19:00 -0000	1.44
@@ -8,7 +8,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
 License: Python Software Foundation License v2 
 Group: Development/Tools
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Tue Feb 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.7.4-2
+- fix 64bit patch
+
 * Tue Feb 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.7.4-1
 - sip-4.7.4