diff --git a/.cvsignore b/.cvsignore index ce34344..06ab9bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,13 +1 @@ -sip-3.10.2.tar.gz -sip-4.1.tar.gz -sip-4.2.tar.gz -sip-4.2.1.tar.gz -sip-4.3.1.tar.gz -sip-4.4.3.tar.gz -sip-4.4.5.tar.gz -sip-4.5.tar.gz -sip-4.5.2.tar.gz -sip-4.6.tar.gz -sip-4.7.1.tar.gz -sip-4.7.2.tar.gz -sip-4.7.3.tar.gz +sip-4.7.4.tar.gz diff --git a/sip-4.7-64bit.patch b/sip-4.7-64bit.patch deleted file mode 100644 index c5bc797..0000000 --- a/sip-4.7-64bit.patch +++ /dev/null @@ -1,27 +0,0 @@ -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-4.7.4-64bit.patch b/sip-4.7.4-64bit.patch new file mode 100644 index 0000000..b7603ef --- /dev/null +++ b/sip-4.7.4-64bit.patch @@ -0,0 +1,12 @@ +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 +@@ -212,7 +212,7 @@ def set_platform_directories(): + global plat_bin_dir, plat_py_lib_dir, plat_sip_dir + + # We trust distutils for some stuff. +- plat_py_site_dir = sysconfig.get_python_lib() ++ plat_py_site_dir = sysconfig.get_python_lib(1) + plat_py_inc_dir = sysconfig.get_python_inc() + plat_py_conf_inc_dir = os.path.dirname(sysconfig.get_config_h_filename()) + diff --git a/sip.spec b/sip.spec index 621704f..32363b1 100644 --- a/sip.spec +++ b/sip.spec @@ -1,3 +1,4 @@ + %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")} @@ -6,7 +7,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.7.3 +Version: 4.7.4 Release: 1%{?dist} # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license License: Python Software Foundation License v2 @@ -15,7 +16,7 @@ Url: http://www.riverbankcomputing.co.uk/sip/ Source0: http://www.riverbankcomputing.com/Downloads/sip4/sip-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: sip-4.7-64bit.patch +Patch1: sip-4.7.4-64bit.patch BuildRequires: python-devel BuildRequires: %{qtpkg}-devel >= %{qtver} @@ -89,6 +90,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 12 2008 Rex Dieter - 4.7.4-1 +- sip-4.7.4 + * Thu Dec 06 2007 Rex Dieter - 4.7.3-1 - sip-4.7.3 diff --git a/sources b/sources index 3e45d14..8d67dca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a792c58d4d211c65949dac6005eb652b sip-4.7.3.tar.gz +3bae6d0fb931fe2ddcd6f6c1da245afa sip-4.7.4.tar.gz