diff --git a/.cvsignore b/.cvsignore index 06ab9bb..0b2c984 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sip-4.7.4.tar.gz +sip-4.7.6.tar.gz diff --git a/sip-4.7.4-64bit.patch b/sip-4.7.4-64bit.patch deleted file mode 100644 index c5daa59..0000000 --- a/sip-4.7.4-64bit.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 13:15:59.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()) - -@@ -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" diff --git a/sip.spec b/sip.spec index 7ff9a2c..f708017 100644 --- a/sip.spec +++ b/sip.spec @@ -12,18 +12,15 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.7.4 -Release: 3%{?dist} +Version: 4.7.6 +Release: 1%{?dist} # http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license License: Python Software Foundation License v2 Group: Development/Tools Url: http://www.riverbankcomputing.co.uk/sip/ -Source0: http://www.riverbankcomputing.com/Downloads/sip4/sip-%{version}.tar.gz +Source0: http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# sent upstream, accepted -Patch1: sip-4.7.4-64bit.patch - BuildRequires: python-devel BuildRequires: %{qtpkg}-devel >= %{qtver} BuildRequires: sed @@ -54,8 +51,6 @@ classes library. %setup -q -%patch1 -p1 -b .64bit - %build QTDIR="" && source /etc/profile.d/qt.sh @@ -85,7 +80,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog LICENSE NEWS README THANKS +%doc ChangeLog LICENSE NEWS README %{python_sitearch}/* %{_bindir}/* @@ -96,6 +91,12 @@ rm -rf %{buildroot} %changelog +* Wed May 21 2008 Rex Dieter - 4.7.6-1 +- sip-4.7.6 + +* Wed May 14 2008 Rex Dieter - 4.7.5-1 +- sip-4.7.5 + * Tue Mar 25 2008 Rex Dieter - 4.7.4-3 - BR: qt3-devel (f9+) diff --git a/sources b/sources index 8d67dca..880c818 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bae6d0fb931fe2ddcd6f6c1da245afa sip-4.7.4.tar.gz +f49e93046fe438a8fb4c2ed481aa3951 sip-4.7.6.tar.gz