[qt5-qttools] 5.2.0-rc1

[Rex Dieter]

commit 55b1fbcc6ec586ddc9fa01f6d6e6b7b9f99bbb9b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 2 11:34:33 2013 -0600

    5.2.0-rc1

 .gitignore                                         |    1 +
 qt5-qttools.spec                                   |    9 ++++++---
 ...=> qttools-opensource-src-5.2.0-qmake-qt5.patch |   14 +++++++-------
 sources                                            |    2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18718a5..6f097bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /qttools-opensource-src-5.1.1.tar.xz
 /qttools-opensource-src-5.2.0-beta1.tar.xz
+/qttools-opensource-src-5.2.0-rc1.tar.xz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 21d41df..430eef9 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,7 +1,7 @@
 
 %global qt_module qttools
 %global system_clucene 1
-%define pre beta1
+%define pre rc1
 
 # define to build docs, need to undef this for bootstrapping
 # where qt5-qttools builds are not yet available
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
 Version: 5.2.0
-Release: 0.5.%{pre}%{?dist}
+Release: 0.10.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -28,7 +28,7 @@ Patch1: qttools-system_clucene.patch
 
 # help lrelease/lupdate use/prefer qmake-qt5
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
-Patch2: qttools-opensource-src-5.2.0-alpha-qmake-qt5.patch
+Patch2: qttools-opensource-src-5.2.0-qmake-qt5.patch
 
 ## upstream patches
 
@@ -338,6 +338,9 @@ fi
 
 
 %changelog
+* Mon Dec 02 2013 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-0.10.rc1
+- 5.2.0-rc1
+
 * Mon Nov 25 2013 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-0.5.beta1
 - enable -doc only on primary archs (allow secondary bootstrap)
 
diff --git a/qttools-opensource-src-5.2.0-alpha-qmake-qt5.patch b/qttools-opensource-src-5.2.0-qmake-qt5.patch
similarity index 58%
rename from qttools-opensource-src-5.2.0-alpha-qmake-qt5.patch
rename to qttools-opensource-src-5.2.0-qmake-qt5.patch
index baf0bba..83c5604 100644
--- a/qttools-opensource-src-5.2.0-alpha-qmake-qt5.patch
+++ b/qttools-opensource-src-5.2.0-qmake-qt5.patch
@@ -1,6 +1,6 @@
-diff -up qttools-opensource-src-5.2.0-alpha/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-alpha/src/linguist/lrelease/main.cpp
---- qttools-opensource-src-5.2.0-alpha/src/linguist/lrelease/main.cpp.qmake-qt5	2013-10-01 22:55:03.530163172 -0500
-+++ qttools-opensource-src-5.2.0-alpha/src/linguist/lrelease/main.cpp	2013-10-01 22:56:27.685283658 -0500
+diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp
+--- qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp.qmake-qt5	2013-11-26 19:01:52.000000000 -0600
++++ qttools-opensource-src-5.2.0-rc1/src/linguist/lrelease/main.cpp	2013-12-02 11:33:01.346611970 -0600
 @@ -318,9 +318,9 @@ int main(int argc, char **argv)
              option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
              if (option.qmake_abslocation.isEmpty())
@@ -13,10 +13,10 @@ diff -up qttools-opensource-src-5.2.0-alpha/src/linguist/lrelease/main.cpp.qmake
  #endif
              option.initProperties();
              QMakeVfs vfs;
-diff -up qttools-opensource-src-5.2.0-alpha/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-alpha/src/linguist/lupdate/main.cpp
---- qttools-opensource-src-5.2.0-alpha/src/linguist/lupdate/main.cpp.qmake-qt5	2013-10-01 22:55:03.531163161 -0500
-+++ qttools-opensource-src-5.2.0-alpha/src/linguist/lupdate/main.cpp	2013-10-01 22:55:56.163613145 -0500
-@@ -1055,7 +1055,7 @@ int main(int argc, char **argv)
+diff -up qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp
+--- qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp.qmake-qt5	2013-11-26 19:01:52.000000000 -0600
++++ qttools-opensource-src-5.2.0-rc1/src/linguist/lupdate/main.cpp	2013-12-02 11:33:01.347611960 -0600
+@@ -1070,7 +1070,7 @@ int main(int argc, char **argv)
          ProFileGlobals option;
          option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE"));
          if (option.qmake_abslocation.isEmpty())
diff --git a/sources b/sources
index 0d940c6..9621a65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a770ed9f3fdd3590ebd4323dd3d9ef4  qttools-opensource-src-5.2.0-beta1.tar.xz
+e7ae71a84014f74db9b7194f8ce1c4de  qttools-opensource-src-5.2.0-rc1.tar.xz