[qt-creator] Update to 3.2.0-rc1

Sandro Mani smani at fedoraproject.org
Wed Aug 6 09:07:57 UTC 2014 

commit 8067039f38da7ab4938b6dfb1bc3834d85d6fc75
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Aug 6 11:06:57 2014 +0200

    Update to 3.2.0-rc1

 .gitignore              |    1 +
 qt-creator.spec         |    7 +++++--
 qt-creator_docdir.patch |   34 +++++++++++++++++-----------------
 sources                 |    2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b117c61..4c5560d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /qt-creator-opensource-src-3.1.1.tar.gz
 /qt-creator-opensource-src-3.1.2.tar.gz
 /qt-creator-opensource-src-3.2.0-beta1.tar.gz
+/qt-creator-opensource-src-3.2.0-rc1.tar.gz
diff --git a/qt-creator.spec b/qt-creator.spec
index 1813e21..22fdae0 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -1,8 +1,8 @@
-%global pre beta1
+%global pre rc1
 
 Name:           qt-creator
 Version:        3.2.0
-Release:        0.2%{?pre:.%pre}%{?dist}
+Release:        0.3%{?pre:.%pre}%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -144,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Aug 06 2014 Sandro Mani <manisandro at gmail.com> - 3.2.0-0.3.rc1
+- 3.2.0 rc1 release
+
 * Tue Jul 29 2014 Sandro Mani <manisandro at gmail.com> - 3.2.0-0.2.beta1
 - doc subpackage
 
diff --git a/qt-creator_docdir.patch b/qt-creator_docdir.patch
index 4e38276..c740c09 100644
--- a/qt-creator_docdir.patch
+++ b/qt-creator_docdir.patch
@@ -1,6 +1,6 @@
-diff -rupN qt-creator-opensource-src-3.2.0-beta1/doc/api/qtcreator-documentation.qdoc qt-creator-opensource-src-3.2.0-beta1-new/doc/api/qtcreator-documentation.qdoc
---- qt-creator-opensource-src-3.2.0-beta1/doc/api/qtcreator-documentation.qdoc	2014-07-07 16:54:53.000000000 +0200
-+++ qt-creator-opensource-src-3.2.0-beta1-new/doc/api/qtcreator-documentation.qdoc	2014-07-28 23:52:12.859408646 +0200
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/doc/api/qtcreator-documentation.qdoc qt-creator-opensource-src-3.2.0-rc1-new/doc/api/qtcreator-documentation.qdoc
+--- qt-creator-opensource-src-3.2.0-rc1/doc/api/qtcreator-documentation.qdoc	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/doc/api/qtcreator-documentation.qdoc	2014-08-06 11:04:48.010941610 +0200
 @@ -283,7 +283,7 @@
      The \QC Manual HTML files are generated in the \c {doc/html} directory.
      The Extending \QC Manual files are generated in the
@@ -10,9 +10,9 @@ diff -rupN qt-creator-opensource-src-3.2.0-beta1/doc/api/qtcreator-documentation
      Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory
      on OS X. You can view the HTML files in a browser and the help files in
      the \QC \gui Help mode. For more information about adding the help files to
-diff -rupN qt-creator-opensource-src-3.2.0-beta1/doc/doc.pri qt-creator-opensource-src-3.2.0-beta1-new/doc/doc.pri
---- qt-creator-opensource-src-3.2.0-beta1/doc/doc.pri	2014-07-07 16:54:53.000000000 +0200
-+++ qt-creator-opensource-src-3.2.0-beta1-new/doc/doc.pri	2014-07-28 23:52:13.121408634 +0200
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/doc/doc.pri qt-creator-opensource-src-3.2.0-rc1-new/doc/doc.pri
+--- qt-creator-opensource-src-3.2.0-rc1/doc/doc.pri	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/doc/doc.pri	2014-08-06 11:04:48.011941609 +0200
 @@ -78,12 +78,12 @@ dev_qch_docs.depends += dev_html_docs
  
  !macx {
@@ -28,9 +28,9 @@ diff -rupN qt-creator-opensource-src-3.2.0-beta1/doc/doc.pri qt-creator-opensour
      inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
      INSTALLS += inst_dev_qch_docs
  
-diff -rupN qt-creator-opensource-src-3.2.0-beta1/qtcreator.pri qt-creator-opensource-src-3.2.0-beta1-new/qtcreator.pri
---- qt-creator-opensource-src-3.2.0-beta1/qtcreator.pri	2014-07-07 16:54:53.000000000 +0200
-+++ qt-creator-opensource-src-3.2.0-beta1-new/qtcreator.pri	2014-07-28 23:52:13.135408634 +0200
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/qtcreator.pri qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.pri
+--- qt-creator-opensource-src-3.2.0-rc1/qtcreator.pri	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.pri	2014-08-06 11:04:48.011941609 +0200
 @@ -160,7 +160,7 @@ macx {
      IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
      IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
@@ -40,10 +40,10 @@ diff -rupN qt-creator-opensource-src-3.2.0-beta1/qtcreator.pri qt-creator-openso
      IDE_BIN_PATH     = $$IDE_APP_PATH
      !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
  }
-diff -rupN qt-creator-opensource-src-3.2.0-beta1/qtcreator.qbs qt-creator-opensource-src-3.2.0-beta1-new/qtcreator.qbs
---- qt-creator-opensource-src-3.2.0-beta1/qtcreator.qbs	2014-07-07 16:54:53.000000000 +0200
-+++ qt-creator-opensource-src-3.2.0-beta1-new/qtcreator.qbs	2014-07-28 23:52:13.489408618 +0200
-@@ -41,7 +41,7 @@ Project {
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/qtcreator.qbs qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.qbs
+--- qt-creator-opensource-src-3.2.0-rc1/qtcreator.qbs	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/qtcreator.qbs	2014-08-06 11:04:48.012941609 +0200
+@@ -42,7 +42,7 @@ Project {
              : ide_app_path
      property string ide_doc_path: qbs.targetOS.contains("osx")
              ? ide_data_path + "/doc"
@@ -52,10 +52,10 @@ diff -rupN qt-creator-opensource-src-3.2.0-beta1/qtcreator.qbs qt-creator-openso
      property string ide_bin_path: qbs.targetOS.contains("osx")
              ? ide_app_target + ".app/Contents/MacOS"
              : ide_app_path
-diff -rupN qt-creator-opensource-src-3.2.0-beta1/src/plugins/coreplugin/icore.cpp qt-creator-opensource-src-3.2.0-beta1-new/src/plugins/coreplugin/icore.cpp
---- qt-creator-opensource-src-3.2.0-beta1/src/plugins/coreplugin/icore.cpp	2014-07-07 16:54:53.000000000 +0200
-+++ qt-creator-opensource-src-3.2.0-beta1-new/src/plugins/coreplugin/icore.cpp	2014-07-28 23:52:09.539408793 +0200
-@@ -421,7 +421,7 @@ QString ICore::userResourcePath()
+diff -rupN qt-creator-opensource-src-3.2.0-rc1/src/plugins/coreplugin/icore.cpp qt-creator-opensource-src-3.2.0-rc1-new/src/plugins/coreplugin/icore.cpp
+--- qt-creator-opensource-src-3.2.0-rc1/src/plugins/coreplugin/icore.cpp	2014-08-01 11:17:30.000000000 +0200
++++ qt-creator-opensource-src-3.2.0-rc1-new/src/plugins/coreplugin/icore.cpp	2014-08-06 11:04:48.012941609 +0200
+@@ -422,7 +422,7 @@ QString ICore::userResourcePath()
  QString ICore::documentationPath()
  {
      const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
diff --git a/sources b/sources
index 3d8fe58..12e440a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b50cd0379009f2c852c316db11e74b2  qt-creator-opensource-src-3.2.0-beta1.tar.gz
+b574b54bea576d51ae79d64405b88e8e  qt-creator-opensource-src-3.2.0-rc1.tar.gz

More information about the scm-commits mailing list