- updated to 4.19.12

- removed obsolete outoftree patch

diff --git a/sip-outoftree.patch b/sip-outoftree.patch
deleted file mode 100644 (file)
index 5a3be45..0000000
--- a/sip-outoftree.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- sip-4.16.3/configure.py.orig       2014-09-11 19:12:51.000000000 +0200
-+++ sip-4.16.3/configure.py    2014-10-27 17:54:50.981640566 +0100
-@@ -47,6 +47,7 @@
- sip_sip_dir = ''
- sysroot = ''
- src_dir = os.path.dirname(os.path.abspath(__file__))
-+build_dir = os.getcwd()
- sip_module_base = None
- build_platform = None
- 
---- sip-4.16.3/siputils.py.orig        2014-09-07 17:30:09.000000000 +0200
-+++ sip-4.16.3/siputils.py     2014-10-27 22:19:01.287642057 +0100
-@@ -202,7 +202,7 @@
-     def __init__(self, configuration, console=0, qt=0, opengl=0, python=0,
-                  threaded=0, warnings=1, debug=0, dir=None,
-                  makefile="Makefile", installs=None, universal=None,
--                 arch=None, deployment_target=None):
-+                 arch=None, deployment_target=None, src_dir=None):
-         """Initialise an instance of the target.  All the macros are left
-         unchanged allowing scripts to manipulate them at will.
- 
-@@ -264,8 +264,11 @@
-         else:
-             self.dir = os.path.curdir
- 
--        # Assume we are building in the source tree.
--        self._src_dir = self.dir
-+        if src_dir is not None:
-+            self._src_dir = src_dir
-+        else:
-+            # Assume we are building in the source tree.
-+            self._src_dir = self.dir
- 
-         if universal is None:
-             self._universal = configuration.universal
-@@ -381,6 +381,8 @@
-         defines.extend(self.optional_list("DEFINES"))
- 
-         incdir = _UniqueList(["."])
-+        if self.dir != self._src_dir:
-+            incdir.append(self._src_dir)
-         incdir.extend(self.extra_include_dirs)
-         incdir.extend(self.optional_list("INCDIR"))
- 
-@@ -1029,7 +1031,8 @@
-         else:
-             if os.path.isabs(filename):
-                 # We appear to be building out of the source tree.
--                self._src_dir = os.path.dirname(filename)
-+                if self._src_dir == self.dir:
-+                    self._src_dir = os.path.dirname(filename)
-                 bfname = filename
-             else:
-                 bfname = os.path.join(self.dir, filename)
-@@ -1465,7 +1471,7 @@
-                  console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0,
-                  dir=None, makefile="Makefile", installs=None, strip=1,
-                  export_all=0, universal=None, arch=None,
--                 deployment_target=None):
-+                 deployment_target=None, src_dir=None):
-         """Initialise an instance of a module Makefile.
- 
-         build_file is the file containing the target specific information.  If
-@@ -1479,7 +1485,7 @@
-         increases the size of the module and slows down module load times but
-         may avoid problems with modules that use exceptions.  The default is 0.
-         """
--        Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch, deployment_target)
-+        Makefile.__init__(self, configuration, console, qt, opengl, 1, threaded, warnings, debug, dir, makefile, installs, universal, arch, deployment_target, src_dir)
- 
-         self._build = self.parse_build_file(build_file)
-         self._install_dir = install_dir
- 

diff --git a/sip.spec b/sip.spec
index 5c19c2b95e2e365f35162099b453877dd41592d8..752768fc653d547aef6358491356758ce298adf5 100644 (file)
--- a/sip.spec
+++ b/sip.spec
@@ -6,14 +6,13 @@
 Summary:       Python bindings generator for C++ class libraries
 Summary(pl.UTF-8):     Generator powiązań Pythona z bibliotekami klas C++
 Name:          sip
-Version:       4.19.3
-Release:       2
+Version:       4.19.12
+Release:       1
 Epoch:         2
 License:       SIP (redistributable, see LICENSE) or GPL v2 or GPL v3
 Group:         Development/Languages/Python
 Source0:       http://downloads.sourceforge.net/pyqt/sip-%{version}.tar.gz
-# Source0-md5: 4708187f74a4188cb4e294060707106f
-Patch0:                %{name}-outoftree.patch
+# Source0-md5: e28b0790dfe4962ce6bbd7c4772f40c9
 URL:           http://www.riverbankcomputing.com/software/sip/
 BuildRequires: libstdc++-devel
 BuildRequires: python-devel >= 1:2.3
@@ -98,7 +97,6 @@ C++ przy użyciu SIP-a.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # configure.py notes: