[qtwebkit] conditionalize use of %%_qt4_importdir better

Rex Dieter rdieter at fedoraproject.org
Tue May 24 14:06:59 UTC 2011


commit f0030e06d1ef641063281761447f9bd6c6bc2da9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue May 24 09:06:35 2011 -0500

    conditionalize use of %%_qt4_importdir better

 qtwebkit.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/qtwebkit.spec b/qtwebkit.spec
index 509c47c..10fe250 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -120,7 +120,7 @@ make install INSTALL_ROOT=%{buildroot} -C WebKitBuild/Release
 ## HACK, there has to be a better way
 chrpath --list   %{buildroot}%{_qt4_libdir}/libQtWebKit.so.4.9.0 ||:
 chrpath --delete %{buildroot}%{_qt4_libdir}/libQtWebKit.so.4.9.0 ||:
-%if 0%{?fedora}
+%if 0%{?_qt4_importdir:1}
 chrpath --list   %{buildroot}%{_qt4_importdir}/QtWebKit/libqmlwebkitplugin.so ||:
 chrpath --delete %{buildroot}%{_qt4_importdir}/QtWebKit/libqmlwebkitplugin.so ||:
 %endif
@@ -137,7 +137,9 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_qt4_libdir}/libQtWebKit.so.4*
-%{?fedora:%{_qt4_importdir}/QtWebKit/}
+%if 0%{?_qt4_importdir:1}
+%{_qt4_importdir}/QtWebKit/
+%endif
 
 %files devel
 %defattr(-,root,root,-)


More information about the scm-commits mailing list