diff options
| author | François Andriot <[email protected]> | 2014-04-04 22:47:12 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2014-04-04 22:47:12 +0200 |
| commit | 2bccc67f69c937e4db4e12f77182be57dbbb9a6a (patch) | |
| tree | b5e373b52fbb70d9965dd446300766b449cf524d /redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec | |
| parent | 7b26da834f79b8b6eb2d8e99a1467ffea2791380 (diff) | |
| download | tde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.tar.gz tde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.zip | |
RPM Packaging: update 3.5.13.2 packages
Diffstat (limited to 'redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec')
| -rw-r--r-- | redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec index 3dc55c64d..ee6f31361 100644 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec @@ -45,6 +45,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Fix include subdirectory 'tde' instead of 'kde' Patch1: python-trinity-3.5.13.2-fix_tde_includedir.patch +# Fix "is private" FTBFS using SIP >= 4.15 +Patch2: python-trinity-3.5.13.2-fix_is_private.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -116,10 +118,12 @@ tips and working code you can use to learn from. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .inc +%patch2 -p1 -b .private %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LD_RUN_PATH="%{tde_libdir}" export KDEDIR=%{tde_prefix} @@ -139,7 +143,15 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 -e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|" %endif -%__make %{_smp_mflags} +# Shitty hack to fix issue with SIP >= 4.15 +%__sed -i "kfile/sipkfilepart0.cpp" \ + -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \ + -e "s| KFileIconView::clear()| KFileView::clear()|g" \ + -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \ + -e "s| KFileDetailView::clear()| KFileView::clear()|g" + + +%__make %{_smp_mflags} || %__make %install |