From e3c767dabc9927b6dfb01ca729741fdc7bbeb253 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jul 22 2008 17:10:16 +0000 Subject: Sync from devel: 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+) Tue Feb 12 2008 Rex Dieter - 4.7.4-2 - fix 64bit patch Tue Feb 12 2008 Rex Dieter - 4.7.4-1 - sip-4.7.4 --- diff --git a/.cvsignore b/.cvsignore index ce34344..0b2c984 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.6.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.spec b/sip.spec index 621704f..f708017 100644 --- a/sip.spec +++ b/sip.spec @@ -1,22 +1,26 @@ + %{!?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)")} +%if 0%{?fedora} > 8 +%define qtver 3.3.8 +%define qtpkg qt3 +%else %define qtver 1:3.3.8 %define qtpkg qt +%endif Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.7.3 +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) -Patch1: sip-4.7-64bit.patch - BuildRequires: python-devel BuildRequires: %{qtpkg}-devel >= %{qtver} BuildRequires: sed @@ -47,8 +51,6 @@ classes library. %setup -q -%patch1 -p1 -b .64bit - %build QTDIR="" && source /etc/profile.d/qt.sh @@ -78,7 +80,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog LICENSE NEWS README THANKS +%doc ChangeLog LICENSE NEWS README %{python_sitearch}/* %{_bindir}/* @@ -89,6 +91,21 @@ 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+) + +* Tue Feb 12 2008 Rex Dieter - 4.7.4-2 +- fix 64bit patch + +* 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..880c818 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a792c58d4d211c65949dac6005eb652b sip-4.7.3.tar.gz +f49e93046fe438a8fb4c2ed481aa3951 sip-4.7.6.tar.gz