[pykde4] fix/rebase use_system_sip_dir.patch

Rex Dieter rdieter at fedoraproject.org
Thu Aug 7 15:03:57 UTC 2014


commit 05742c562056b12f72e5f999d98dea48e74f228a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Aug 7 10:03:51 2014 -0500

    fix/rebase use_system_sip_dir.patch

 pykde4-4.13.97-use_system_sip_dir.patch |   17 ++++-------------
 pykde4.spec                             |    5 ++++-
 2 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/pykde4-4.13.97-use_system_sip_dir.patch b/pykde4-4.13.97-use_system_sip_dir.patch
index 1ed2db9..c548f3a 100644
--- a/pykde4-4.13.97-use_system_sip_dir.patch
+++ b/pykde4-4.13.97-use_system_sip_dir.patch
@@ -1,21 +1,12 @@
 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 ()
++++ pykde4-4.13.97/CMakeLists.txt	2014-08-07 10:02:34.770363996 -0500
+@@ -108,7 +108,7 @@ else ()
  endif ()
  set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
  
 -set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
--
++set(SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR}/PyKDE4)
+ 
  # 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 1e55d75..3b4cd52 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -15,7 +15,7 @@
 
 Name:    pykde4 
 Version: 4.13.97
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python bindings for KDE4 
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -297,6 +297,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 
 
 %changelog
+* Thu Aug 07 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.97-2
+- fix/rebase use_system_sip_dir.patch
+
 * Tue Aug 05 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.13.97-1
 - 4.13.97
 


More information about the scm-commits mailing list