[qt5-qtquick1] treat qtchooser stuff better
Rex Dieter
rdieter at fedoraproject.org
Tue Sep 16 13:57:13 UTC 2014
commit aa996cf8ad6c0e3e156b234e2c346f6d65952577
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Sep 16 08:56:47 2014 -0500
treat qtchooser stuff better
and different than qt4 conflicts
qt5-qtquick1.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/qt5-qtquick1.spec b/qt5-qtquick1.spec
index 8f0dbc3..31b7189 100644
--- a/qt5-qtquick1.spec
+++ b/qt5-qtquick1.spec
@@ -92,10 +92,16 @@ mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt5_bindir}
for i in * ; do
case "${i}" in
- qml1plugindump|qmlviewer)
+ # qt4 conflicts
+ qmlviewer)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
ln -sv ${i} ${i}-qt5
;;
+ # stuff handled by qtchooser
+ qml1plugindump|
+ ln -v ${i} %{buildroot}%{_bindir}/${i}
+ ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
+ ln -sv ${i} ${i}-qt5
*)
ln -v ${i} %{buildroot}%{_bindir}/${i}
;;
More information about the scm-commits
mailing list