5.6.0 (sync from qt5 copr), (re)add bootstrap macro support
This commit is contained in:
parent
f6457c1314
commit
7d85456e17
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/qtwebchannel-opensource-src-5.5.1.tar.xz
|
/qtwebchannel-opensource-src-5.5.1.tar.xz
|
||||||
|
/qtwebchannel-opensource-src-5.6.0-beta1.tar.xz
|
||||||
|
@ -11,12 +11,12 @@
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
## define prerelease rc1
|
%define prerelease beta1
|
||||||
|
|
||||||
Summary: Qt5 - WebChannel component
|
Summary: Qt5 - WebChannel component
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.5.1
|
Version: 5.6.0
|
||||||
Release: 2%{?dist}
|
Release: 0.2%{?dist}
|
||||||
|
|
||||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||||
# See also http://doc.qt.io/qt-5/licensing.html
|
# See also http://doc.qt.io/qt-5/licensing.html
|
||||||
@ -27,8 +27,7 @@ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:
|
|||||||
BuildRequires: qt5-qtbase-devel >= %{version}
|
BuildRequires: qt5-qtbase-devel >= %{version}
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
BuildRequires: pkgconfig(Qt5Quick)
|
BuildRequires: pkgconfig(Qt5Quick)
|
||||||
|
# Qt5WebSockets package is optional and only needed for some examples
|
||||||
# Qt5WebSockets package is optional and only needed for examples
|
|
||||||
BuildRequires: pkgconfig(Qt5WebSockets)
|
BuildRequires: pkgconfig(Qt5WebSockets)
|
||||||
|
|
||||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||||
@ -50,6 +49,7 @@ Requires: qt5-qtbase-devel%{?_isa}
|
|||||||
Summary: API documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
License: GFDL
|
License: GFDL
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
BuildRequires: qt5-qdoc
|
||||||
BuildRequires: qt5-qhelpgenerator
|
BuildRequires: qt5-qhelpgenerator
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%description doc
|
%description doc
|
||||||
@ -66,6 +66,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
|
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir %{_target_platform}
|
mkdir %{_target_platform}
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
@ -132,6 +133,12 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.2
|
||||||
|
- restore bootstrap macro support
|
||||||
|
|
||||||
|
* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
|
||||||
|
- Start to implement 5.6.0 beta
|
||||||
|
|
||||||
* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
|
* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
|
||||||
- Update for final qt 5.5.1
|
- Update for final qt 5.5.1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user