- one more fix in outoftree patch (VPATH support for moc rules, needed for PyQt4...

- release 2

diff --git a/sip-outoftree.patch b/sip-outoftree.patch
index fc08abbcba676c936c70457c8fdd19e7052e19e9..2a90e69e19ecc9d23c2726a1f363a6216255596b 100644 (file)
--- a/sip-outoftree.patch
+++ b/sip-outoftree.patch
@@ -84,3 +84,12 @@
  
          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")
+ 

diff --git a/sip.spec b/sip.spec
index 192efaac233062df3a8be55d50af8f11915289c6..2e61ad2c67a4ab4e4e395b943aa692f729c955e1 100644 (file)
--- a/sip.spec
+++ b/sip.spec
@@ -8,7 +8,7 @@ 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:       1
+Release:       2
 Epoch:         2
 License:       SIP (redistributable, see LICENSE) or GPL v2 or GPL v3
 Group:         Development/Languages/Python