[packages/sip] - Up to 4.16.6.

[lmasko]

commit 5805a3229ec5a8b0c0426c37d8aea8b50d4bd4c5
Author: Lukasz Masko <lmasko at pld-linux.org>
Date:   Thu Mar 12 16:50:06 2015 +0100

    - Up to 4.16.6.

 sip-outoftree.patch | 22 ----------------------
 sip.spec            |  6 +++---
 2 files changed, 3 insertions(+), 25 deletions(-)
---
diff --git a/sip.spec b/sip.spec
index c34ff28..5cdbc31 100644
--- a/sip.spec
+++ b/sip.spec
@@ -7,13 +7,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.16.4
-Release:	3
+Version:	4.16.6
+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:	a9840670a064dbf8f63a8f653776fec9
+# Source0-md5:	44e87c4c98206f465d3f07f4caa0c903
 Patch0:		%{name}-outoftree.patch
 URL:		http://www.riverbankcomputing.com/software/sip/
 BuildRequires:	libstdc++-devel
diff --git a/sip-outoftree.patch b/sip-outoftree.patch
index 2a90e69..5a3be45 100644
--- a/sip-outoftree.patch
+++ b/sip-outoftree.patch
@@ -8,20 +8,6 @@
  sip_module_base = None
  build_platform = None
  
-@@ -455,10 +456,11 @@
- 
-         sipconfig.ModuleMakefile(
-             configuration=cfg,
--            build_file=os.path.join(src_dir, "siplib", "siplib.sbf"),
-+            build_file=os.path.join(build_dir, "siplib", "siplib.sbf"),
-             dir="siplib",
-+            src_dir=os.path.join(src_dir, "siplib"),
-             install_dir=cfg.sip_mod_dir,
--            installs=([os.path.join(src_dir, "siplib", "sip.h")], cfg.sip_inc_dir),
-+            installs=([os.path.join(build_dir, "siplib", "sip.h")], cfg.sip_inc_dir),
-             console=1,
-             warnings=0,
-             static=opts.static,
 --- 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 @@
@@ -84,12 +70,4 @@
  
          self._build = self.parse_build_file(build_file)
          self._install_dir = install_dir
-@@ -1677,7 +1683,7 @@
-             cpp = "moc_" + root + ".cpp"
- 
-             mfile.write("\n%s: %s\n" % (cpp, mf))
--            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
-+            mfile.write("\t$(MOC) -o %s $<\n" % cpp)
- 
-         mfile.write("\n$(TARGET): $(OFILES)\n")
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sip.git/commitdiff/5805a3229ec5a8b0c0426c37d8aea8b50d4bd4c5