[mingw-qt5-qttools] Update to 5.2.0 RC1 and renamed the -lrelease subpackage to -tools
Erik van Pienbroek
epienbro at fedoraproject.org
Fri Nov 29 19:35:41 UTC 2013
commit 56a7f60e7a8f75581fcdf347a15aba5bc1473759
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri Nov 29 20:35:32 2013 +0100
Update to 5.2.0 RC1 and renamed the -lrelease subpackage to -tools
.gitignore | 1 +
mingw-qt5-qttools.spec | 50 ++++++++++++++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 38 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c24d25..c680133 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qttools-opensource-src-5.0.2.tar.xz
/qttools-opensource-src-5.1.0.tar.xz
/qttools-opensource-src-5.1.1.tar.xz
+/qttools-opensource-src-5.2.0-rc1.tar.xz
diff --git a/mingw-qt5-qttools.spec b/mingw-qt5-qttools.spec
index 982cb54..02ef7b4 100644
--- a/mingw-qt5-qttools.spec
+++ b/mingw-qt5-qttools.spec
@@ -5,7 +5,7 @@
%global __debug_install_post %%{mingw_debug_install_post}; %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil}
%global qt_module qttools
-#%%global pre beta1
+%global pre rc1
#%%global snapshot_date 20121112
#%%global snapshot_rev 769fa282
@@ -20,8 +20,8 @@
%global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name: mingw-qt5-%{qt_module}
-Version: 5.1.1
-Release: 1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Version: 5.2.0
+Release: 0.1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
Summary: Qt5 for Windows - QtTools component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -33,7 +33,11 @@ URL: http://qt-project.org/
# wget http://qt.gitorious.org/qt/%{qt_module}/archive-tarball/%{snapshot_rev} -O qt5-%{qt_module}-%{snapshot_rev}.tar.gz
Source0: qt5-%{qt_module}-%{snapshot_rev}.tar.gz
%else
-Source0: http://download.qt-project.org/official_releases/qt/%{release_version}/%{version}/submodules/%{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}.tar.xz
+%if "%{?pre}" != ""
+Source0: http://download.qt-project.org/development_releases/qt/%{release_version}/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
+%else
+Source0: http://download.qt-project.org/official_releases/qt/%{release_version}/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+%endif
%endif
BuildRequires: mingw32-filesystem >= 96
@@ -72,10 +76,12 @@ cross-platform applications.
This is the Windows version of Qt, for use in conjunction with the
Fedora Windows cross-compiler.
-%package -n mingw32-qt5-%{qt_module}-lrelease
+%package -n mingw32-qt5-%{qt_module}-tools
Summary: Qt5 for Windows - QtTools component
+Obsoletes: mingw32-qt5-%{qt_module}-lrelease < 5.1.2-1
+Provides: mingw32-qt5-%{qt_module}-lrelease = 5.1.2-1
-%description -n mingw32-qt5-%{qt_module}-lrelease
+%description -n mingw32-qt5-%{qt_module}-tools
This package contains the Qt software toolkit for developing
cross-platform applications.
@@ -95,10 +101,12 @@ cross-platform applications.
This is the Windows version of Qt, for use in conjunction with the
Fedora Windows cross-compiler.
-%package -n mingw64-qt5-%{qt_module}-lrelease
+%package -n mingw64-qt5-%{qt_module}-tools
Summary: Qt5 for Windows - QtTools component
+Obsoletes: mingw64-qt5-%{qt_module}-lrelease < 5.1.2-1
+Provides: mingw64-qt5-%{qt_module}-lrelease = 5.1.2-1
-%description -n mingw64-qt5-%{qt_module}-lrelease
+%description -n mingw64-qt5-%{qt_module}-tools
This package contains the Qt software toolkit for developing
cross-platform applications.
@@ -173,6 +181,7 @@ done
%{mingw32_bindir}/qdbusviewer-qt5.exe
%{mingw32_bindir}/qhelpconverter-qt5.exe
%{mingw32_bindir}/qhelpgenerator-qt5.exe
+%{mingw32_bindir}/qtpaths-qt5.exe
%{mingw32_includedir}/qt5/QtCLucene/
%{mingw32_includedir}/qt5/QtDesigner/
%{mingw32_includedir}/qt5/QtDesignerComponents/
@@ -193,20 +202,24 @@ done
%{mingw32_libdir}/pkgconfig/Qt5DesignerComponents.pc
%{mingw32_libdir}/pkgconfig/Qt5Help.pc
%{mingw32_libdir}/pkgconfig/Qt5UiTools.pc
-%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_clucene.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_clucene_private.pri
%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_designer.pri
-%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_designercomponents.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_designer_private.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_help.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_help_private.pri
%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_uitools.pri
+%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_uitools_private.pri
%{mingw32_datadir}/qt5/phrasebooks/
-%files -n mingw32-qt5-%{qt_module}-lrelease
+%files -n mingw32-qt5-%{qt_module}-tools
%{_bindir}/%{mingw32_target}-lconvert-qt5
%{_prefix}/%{mingw32_target}/bin/lconvert-qt5
%{_bindir}/%{mingw32_target}-lupdate-qt5
%{_prefix}/%{mingw32_target}/bin/lupdate-qt5
%{_bindir}/%{mingw32_target}-lrelease-qt5
%{_prefix}/%{mingw32_target}/bin/lrelease-qt5
+%{_prefix}/%{mingw32_target}/bin/windeployqt
# Win64
%files -n mingw64-qt5-%{qt_module}
@@ -223,6 +236,7 @@ done
%{mingw64_bindir}/qdbusviewer-qt5.exe
%{mingw64_bindir}/qhelpconverter-qt5.exe
%{mingw64_bindir}/qhelpgenerator-qt5.exe
+%{mingw64_bindir}/qtpaths-qt5.exe
%{mingw64_includedir}/qt5/QtCLucene/
%{mingw64_includedir}/qt5/QtDesigner/
%{mingw64_includedir}/qt5/QtDesignerComponents/
@@ -243,23 +257,31 @@ done
%{mingw64_libdir}/pkgconfig/Qt5DesignerComponents.pc
%{mingw64_libdir}/pkgconfig/Qt5Help.pc
%{mingw64_libdir}/pkgconfig/Qt5UiTools.pc
-%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_clucene.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_clucene_private.pri
%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_designer.pri
-%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_designercomponents.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_designer_private.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_help.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_help_private.pri
%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_uitools.pri
+%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_uitools_private.pri
%{mingw64_datadir}/qt5/phrasebooks/
-%files -n mingw64-qt5-%{qt_module}-lrelease
+%files -n mingw64-qt5-%{qt_module}-tools
%{_bindir}/%{mingw64_target}-lconvert-qt5
%{_prefix}/%{mingw64_target}/bin/lconvert-qt5
%{_bindir}/%{mingw64_target}-lupdate-qt5
%{_prefix}/%{mingw64_target}/bin/lupdate-qt5
%{_bindir}/%{mingw64_target}-lrelease-qt5
%{_prefix}/%{mingw64_target}/bin/lrelease-qt5
+%{_prefix}/%{mingw64_target}/bin/windeployqt
%changelog
+* Fri Nov 29 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-0.1.rc1
+- Update to 5.2.0 RC1
+- Renamed the -lrelease subpackage to -tools
+
* Sat Sep 7 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-1
- Update to 5.1.1
diff --git a/sources b/sources
index ad45c2b..9621a65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-022073d32ff9d408de0182b5d1f01781 qttools-opensource-src-5.1.1.tar.xz
+e7ae71a84014f74db9b7194f8ce1c4de qttools-opensource-src-5.2.0-rc1.tar.xz
More information about the scm-commits
mailing list