[pykde4] bring back use_system_sip_dir.patch

[Rex Dieter]

commit 56c945673888c7cf454720bd9d0b5fe7934be317
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Aug 5 07:31:43 2014 -0500

    bring back use_system_sip_dir.patch
    
    forgot why that was needed exactly, python3 build fails without it

 make_pykde4_respect_sip_flags.diff      |    8 ++++----
 pykde4-4.13.97-use_system_sip_dir.patch |   21 +++++++++++++++++++++
 pykde4.spec                             |    6 ++++++
 3 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/make_pykde4_respect_sip_flags.diff b/make_pykde4_respect_sip_flags.diff
index 6ca93d6..8d8f030 100644
--- a/make_pykde4_respect_sip_flags.diff
+++ b/make_pykde4_respect_sip_flags.diff
@@ -1,6 +1,6 @@
 diff -up pykde4-4.13.97/CMakeLists.txt.203 pykde4-4.13.97/CMakeLists.txt
---- pykde4-4.13.97/CMakeLists.txt.203	2014-08-05 00:00:48.662013293 -0500
-+++ pykde4-4.13.97/CMakeLists.txt	2014-08-05 00:01:51.729355782 -0500
+--- pykde4-4.13.97/CMakeLists.txt.203	2014-08-05 07:29:58.066096153 -0500
++++ pykde4-4.13.97/CMakeLists.txt	2014-08-05 07:30:37.650684399 -0500
 @@ -101,6 +101,9 @@ include_directories(
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
@@ -18,5 +18,5 @@ diff -up pykde4-4.13.97/CMakeLists.txt.203 pykde4-4.13.97/CMakeLists.txt
 -set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
 +set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
  
- set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
- 
+ # Use an extra option when compiling on Python 3.
+ if (PYTHON_VERSION_MAJOR GREATER 2)
diff --git a/pykde4-4.13.97-use_system_sip_dir.patch b/pykde4-4.13.97-use_system_sip_dir.patch
new file mode 100644
index 0000000..1ed2db9
--- /dev/null
+++ b/pykde4-4.13.97-use_system_sip_dir.patch
@@ -0,0 +1,21 @@
+diff -up pykde4-4.13.97/CMakeLists.txt.use_system_sip_dir pykde4-4.13.97/CMakeLists.txt
+--- pykde4-4.13.97/CMakeLists.txt.use_system_sip_dir	2014-07-29 12:05:46.000000000 -0500
++++ pykde4-4.13.97/CMakeLists.txt	2014-08-05 07:27:03.494912024 -0500
+@@ -108,8 +108,6 @@ else ()
+ endif ()
+ set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
+ 
+-set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
+-
+ # Use an extra option when compiling on Python 3.
+ if (PYTHON_VERSION_MAJOR GREATER 2)
+     if(PYQT4_VERSION STRGREATER "040904")
+@@ -251,7 +249,7 @@ python_install(__init__.py ${PYTHON_SITE
+ 
+ # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
+ # (Don't forget the / at the end of sip/.)
+-install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4
++install(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
+     PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
+     PATTERN ".svn" EXCLUDE
+     PATTERN "*.in" EXCLUDE)
diff --git a/pykde4.spec b/pykde4.spec
index 918c21a..1e55d75 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -29,6 +29,10 @@ URL:     http://developer.kde.org/language-bindings/
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+# Revert https://reviewboard.kde.org/r/101903
+# hard-codes sip path to /usr/share/sip, instead of respecting system path
+Patch1: pykde4-4.13.97-use_system_sip_dir.patch
+
 ## upstreamable patches
 # see also https://bugzilla.redhat.com/show_bug.cgi?id=1050944
 Patch50: pykde4-4.12.3-python_library_realpath.patch
@@ -148,6 +152,8 @@ Provides:  python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
 %prep
 %setup -q -n pykde4-%{version}
 
+%patch1 -p1 -b .use_system_sip_dir
+
 %patch50 -p1 -b .python_library_realpath
 %if "%{?sip_version_min}" == "4.15.5"
 %patch51 -p1 -b .sip_4_15_5