rpms/qt5-qtscript
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Merge fix

Browse Source
This commit is contained in:
Helio Chissini de Castro 2015-12-10 22:14:58 +01:00
commit 3d974078ce
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/qtscript-opensource-src-5.5.1-rc1.tar.xz /qtscript-opensource-src-5.5.1-rc1.tar.xz
/qtscript-opensource-src-5.5.1.tar.xz /qtscript-opensource-src-5.5.1.tar.xz
/qtscript-opensource-src-5.6.0-beta.tar.gz /qtscript-opensource-src-5.6.0-beta.tar.gz
/qtscript-opensource-src-5.6.0-beta1.tar.xz

8
qt5-qtscript.spec
View File

@ -8,7 +8,7 @@
Summary: Qt5 - QtScript component Summary: Qt5 - QtScript component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.6.0 Version: 5.6.0
Release: 0.2%{?dist} Release: 0.3%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -38,6 +38,7 @@ Requires: qt5-qtbase-devel%{?_isa}
%package doc %package doc
Summary: API documentation for %{name} Summary: API documentation for %{name}
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
@ -125,9 +126,12 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
%changelog %changelog
* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2 * Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.3
- Official beta release - Official beta release
* Mon Dec 07 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 * Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
- Start to implement 5.6.0 beta - Start to implement 5.6.0 beta

4
sources
View File

@ -1 +1,5 @@
<<<<<<< HEAD
305e520f85d11dc666291853e862e50d qtscript-opensource-src-5.6.0-beta.tar.gz 305e520f85d11dc666291853e862e50d qtscript-opensource-src-5.6.0-beta.tar.gz
=======
d49e0b0151802ecc68e3eebbb6f39c56 qtscript-opensource-src-5.6.0-beta1.tar.xz
>>>>>>> 97c0d990280cede7801671aa2397119e7d8dd9dd