rpms
/
qt5-qttools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

5.2.0-rc1

This commit is contained in:
Rex Dieter 2013-12-02 11:34:33 -06:00
parent 5e758cc05b
commit 55b1fbcc6e
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

9
qt5-qttools.spec
View File

@ -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@fedoraproject.org> 5.2.0-0.10.rc1
- 5.2.0-rc1
* Mon Nov 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.5.beta1
- enable -doc only on primary archs (allow secondary bootstrap)

14
qttools-opensource-src-5.2.0-alpha-qmake-qt5.patch → qttools-opensource-src-5.2.0-qmake-qt5.patch
View File

@ -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())

2
sources
View File

@ -1 +1 @@
2a770ed9f3fdd3590ebd4323dd3d9ef4 qttools-opensource-src-5.2.0-beta1.tar.xz
e7ae71a84014f74db9b7194f8ce1c4de qttools-opensource-src-5.2.0-rc1.tar.xz