[qt-creator] fix qmlpuppet install
Itamar Reis Peixoto
itamarjp at fedoraproject.org
Wed Jun 29 12:07:22 UTC 2011
commit 90d171454f9373667f814bf5d54c2dcf3551efb8
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date: Wed Jun 29 09:06:56 2011 -0300
fix qmlpuppet install
fix_qmlpuppet_installation.patch | 25 +++++++++++++++++++++++++
qt-creator.spec | 11 ++++++++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/fix_qmlpuppet_installation.patch b/fix_qmlpuppet_installation.patch
new file mode 100644
index 0000000..fe290a1
--- /dev/null
+++ b/fix_qmlpuppet_installation.patch
@@ -0,0 +1,25 @@
+From 616bc605893752c6382626cb21ce589540783d1a Mon Sep 17 00:00:00 2001
+From: BogDan Vatra <bog_dan_ro at yahoo.com>
+Date: Wed, 25 May 2011 12:00:06 +0800
+Subject: [PATCH] Fix qmlpuppet installation
+
+QTCREATORBUG-4909
+---
+ src/tools/qmlpuppet/qmlpuppet.pro | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/tools/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet.pro
+index 7772d9d..45efe52 100644
+--- a/src/tools/qmlpuppet/qmlpuppet.pro
++++ b/src/tools/qmlpuppet/qmlpuppet.pro
+@@ -32,4 +32,7 @@ macx {
+ info.input = Info.plist.in
+ info.output = $$IDE_BIN_PATH/$${TARGET}.app/Contents/Info.plist
+ QMAKE_SUBSTITUTES += info
++}else {
++ target.path = /bin
++ INSTALLS += target
+ }
+--
+1.6.1
+
diff --git a/qt-creator.spec b/qt-creator.spec
index 6241459..bb26d14 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -1,6 +1,6 @@
Name: qt-creator
Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight and cross-platform IDE for Qt
Group: Development/Tools
@@ -27,6 +27,10 @@ BuildRequires: qt4-webkit-devel
BuildRequires: qt4-devel-private
BuildRequires: desktop-file-utils
+# possible fix from BogDan Vatra
+# http://bugreports.qt.nokia.com/browse/QTCREATORBUG-4909
+Patch0: fix_qmlpuppet_installation.patch
+
%description
Qt Creator (previously known as Project Greenhouse) is a new,
@@ -36,6 +40,7 @@ even faster and easier.
%prep
%setup -q -n %{name}-%{version}-src
+%patch0 -p1
%build
QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
@@ -86,6 +91,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
+%{_bindir}/qmlpuppet
%{_bindir}/qtpromaker
%{_bindir}/qtcreator
%{_bindir}/qtcreator_process_stub
@@ -97,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/doc/qtcreator/qtcreator.qch
%changelog
+* Wed Jun 29 2011 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.2.1-2
+- include qmlpuppet
+
* Tue Jun 21 2011 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.2.1-1
- 2.2.1
More information about the scm-commits
mailing list