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

5.6.0-0.3

Browse Source 
- include BR: qt5-qdoc only in -doc subpkg
- restore bootstrap macro support
- make openal support unconditional (#1069231)
This commit is contained in:
Rex Dieter 2015-12-11 12:56:13 -06:00
parent 1a6e9516a2
commit 80ec4c6119
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qt5-qtmultimedia.spec
View File

@ -1,24 +1,30 @@
%global qt_module qtmultimedia %global qt_module qtmultimedia
%define docs 1 # define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available
# only primary archs (for now), allow secondary to bootstrap
#global bootstrap 1
%if ! 0%{?bootstrap}
%ifarch %{arm} %{ix86} x86_64
%define docs 1
%endif
%endif
# openal not currently supported on epel7, https://bugzilla.redhat.com/1069231
%if 0%{?rhel} != 7
%global openal 1 %global openal 1
%global gst 0.10
%if 0%{?fedora} > 20
%global gst 1.0
%endif %endif
%define prerelease beta %define prerelease beta
%define gst 0.10
%if 0%{?fedora} > 20
%define gst 1.0
%endif
Summary: Qt5 - Multimedia support Summary: Qt5 - Multimedia support
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
@ -28,7 +34,6 @@ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:
BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: pkgconfig(Qt5Quick) >= %{version} BuildRequires: pkgconfig(Qt5Quick) >= %{version}
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: qt5-qdoc
%if "%{?gst}" == "0.10" %if "%{?gst}" == "0.10"
BuildRequires: pkgconfig(gstreamer-interfaces-0.10) BuildRequires: pkgconfig(gstreamer-interfaces-0.10)
%endif %endif
@ -66,6 +71,7 @@ Requires: qt5-qtdeclarative-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
@ -172,6 +178,11 @@ popd
%changelog %changelog
* Fri Dec 11 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-0.3
- include BR: qt5-qdoc only in -doc subpkg
- restore bootstrap macro support
- make openal support unconditional (#1069231)
* 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.2
- Official beta release - Official beta release
@ -184,7 +195,6 @@ popd
* Thu Oct 22 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-3 * Thu Oct 22 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-3
- drop gst support on el6 (QTBUG-48939) - drop gst support on el6 (QTBUG-48939)
>>>>>>> fd4ed5e29285a7afe1be8c8cf30c7247fcad9fbb
* 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 to final release 5.5.1 - Update to final release 5.5.1