diff --git a/.gitignore b/.gitignore index 1c16fa5..d316cba 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /qtgraphicaleffects-opensource-src-5.5.1.tar.xz /qtgraphicaleffects-opensource-src-5.6.0.tar.xz /qtgraphicaleffects-opensource-src-5.7.1.tar.xz +/qtgraphicaleffects-opensource-src-5.8.0.tar.xz diff --git a/mingw-qt5-qtgraphicaleffects.spec b/mingw-qt5-qtgraphicaleffects.spec index 9fffa4f..7c76cf2 100644 --- a/mingw-qt5-qtgraphicaleffects.spec +++ b/mingw-qt5-qtgraphicaleffects.spec @@ -3,11 +3,11 @@ %global qt_module qtgraphicaleffects #%%global pre rc1 -#%%global snapshot_date 20121112 -#%%global snapshot_rev fcbc6043 +#global commit fcbc6043f102dce56f0c457748f489e7e2bd0c0b +#global shortcommit %(c=%{commit}; echo ${c:0:7}) -%if 0%{?snapshot_date} -%global source_folder qt-%{qt_module} +%if 0%{?commit:1} +%global source_folder %{qt_module}-%{commit} %else %global source_folder %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} %endif @@ -16,33 +16,26 @@ %global release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.7.1 -Release: 2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} +Version: 5.8.0 +Release: 1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} Summary: Qt5 for Windows - QtGraphicalEffects component License: GPLv3 with exceptions or LGPLv2 with exceptions -Group: Development/Libraries -URL: http://qt-project.org/ +URL: http://qt.io/ -%if 0%{?snapshot_date} -# To regenerate: -# 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 +%if 0%{?commit:1} +Source0: https://github.com/qt/%{qt_module}/archive/%{commit}/%{qt_module}-opensource-src-%{commit}.tar.gz %else -%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 +Source0: http://download.qt-project.org/%{?pre:development}%{?!pre:official}_releases/qt/%{release_version}/%{version}%{?pre:-%pre}/submodules/%{qt_module}-opensource-src-%{version}%{?pre:-%pre}.tar.xz %endif BuildArch: noarch BuildRequires: mingw32-filesystem >= 96 -BuildRequires: mingw32-qt5-qtbase >= 5.6.0 +BuildRequires: mingw32-qt5-qtbase = %{version} BuildRequires: mingw64-filesystem >= 96 -BuildRequires: mingw64-qt5-qtbase >= 5.6.0 +BuildRequires: mingw64-qt5-qtbase = %{version} %description @@ -89,6 +82,10 @@ Fedora Windows cross-compiler. %prep %autosetup -p1 -n %{source_folder} +%if 0%{?commit:1} +# Make sure the syncqt tool is run when using a git snapshot +mkdir .git +%endif %build @@ -97,19 +94,24 @@ Fedora Windows cross-compiler. %install -%mingw_make install INSTALL_ROOT=$RPM_BUILD_ROOT +%mingw_make install INSTALL_ROOT=%{buildroot} # Win32 %files -n mingw32-qt5-%{qt_module} +%license LICENSE.LGPL* LGPL_EXCEPTION.txt %{mingw32_datadir}/qt5/qml/QtGraphicalEffects/ # Win64 %files -n mingw64-qt5-%{qt_module} +%license LICENSE.LGPL* LGPL_EXCEPTION.txt %{mingw64_datadir}/qt5/qml/QtGraphicalEffects/ %changelog +* Thu May 04 2017 Sandro Mani - 5.8.0-1 +- Update to 5.8.0 + * Fri Feb 10 2017 Fedora Release Engineering - 5.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 99672f1..32a7085 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 2eb5fa078be65fbf1b57aca7106cd77c840aea3f13671445552ea4a5e0c6ff1625e30f58ca4919ea6dd76229931a307a77f172b604a55fc115569c4e446b5a3d +SHA512 (qtgraphicaleffects-opensource-src-5.8.0.tar.xz) = a51b111cbac1c86052881ea479c0131f8d2198e82d9a6e5bd4e49641ce25aef474900df6d3ed4cc4dcf445dc5cd9263e1c6547c87ed0fbf311672d8b7af63035