- Merge fix

This commit is contained in:
Helio Chissini de Castro 2015-12-10 22:32:39 +01:00
commit 317d302a8a
2 changed files with 5 additions and 6 deletions

7
.gitignore vendored
View File

@ -1,8 +1,3 @@
/qtlocation-opensource-src-5.4.0.tar.xz
/qtlocation-opensource-src-5.4.1.tar.xz
/qtlocation-opensource-src-5.4.2.tar.xz
/qtlocation-opensource-src-5.5.0-rc.tar.xz
/qtlocation-opensource-src-5.5.0.tar.xz
/qtlocation-opensource-src-5.5.1-rc1.tar.xz
/qtlocation-opensource-src-5.5.1.tar.xz
/qtlocation-opensource-src-5.6.0-beta.tar.gz
/qtlocation-opensource-src-5.6.0-beta1.tar.xz

View File

@ -47,6 +47,7 @@ Requires: qt5-qtbase-devel%{?_isa}
%package doc
Summary: API documentation for %{name}
Requires: %{name} = %{version}-%{release}
BuildRequires: qt5-qdoc
BuildRequires: qt5-qhelpgenerator
BuildArch: noarch
%description doc
@ -149,6 +150,9 @@ popd
* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2
- Official beta release
* Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.2
- (re)add 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