From c1f6b7e0c089ad4511cb748caafc971e810e4760 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Oct 2013 23:06:25 -0500 Subject: [PATCH] 5.2.0-0.1.alpha - 5.2.0-alpha - -doc subpkg --- .gitignore | 2 +- qt5-qtmultimedia.spec | 51 +++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e2eca99..91a1be4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/qtmultimedia-opensource-src-5.0.2.tar.xz /qtmultimedia-opensource-src-5.1.1.tar.xz +/qtmultimedia-opensource-src-5.2.0-alpha.tar.xz diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec index d1e5db0..0383ed4 100644 --- a/qt5-qtmultimedia.spec +++ b/qt5-qtmultimedia.spec @@ -1,18 +1,27 @@ %global qt_module qtmultimedia +%define pre alpha + +# define to build docs, need to undef this for bootstrapping +# where qt5-qttools builds are not yet available +%define docs 1 Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.1.1 -Release: 2%{?dist} +Version: 5.2.0 +Release: 0.1.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ -Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%if 0%{?pre:1} +Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz +%else +Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%endif -# qt5-qtjsbackend (and so qt5-qtdeclarative) supports only ix86, x86_64 and arm , and so do we here -ExclusiveArch: %{ix86} x86_64 %{arm} +# http://bugzilla.redhat.com/1005482 +ExcludeArch: ppc64 ppc BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -45,22 +54,38 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %description devel %{summary}. +%if 0%{?docs} +%package doc +Summary: API documentation for %{name} +Requires: %{name} = %{version}-%{release} +# for qhelpgenerator +BuildRequires: qt5-qttools-devel +BuildArch: noarch +%description doc +%{summary}. +%endif + %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} %build - %{_qt5_qmake} make %{?_smp_mflags} +%if 0%{?docs} +make %{?_smp_mflags} docs +%endif %install - make install INSTALL_ROOT=%{buildroot} +%if 0%{?docs} +make install_docs INSTALL_ROOT=%{buildroot} +%endif + ## .prl file love (maybe consider just deleting these -- rex # nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs sed -i \ @@ -105,8 +130,20 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %{_qt5_libdir}/pkgconfig/Qt5MultimediaWidgets.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri +%if 0%{?docs} +%files doc +%{_qt5_docdir}/qtmultimedia.qch +%{_qt5_docdir}/qtmultimedia/ +%{_qt5_docdir}/qtmultimediawidgets.qch +%{_qt5_docdir}/qtmultimediawidgets/ +%endif + %changelog +* Wed Oct 02 2013 Rex Dieter 5.2.0-0.1.alpha +- 5.2.0-alpha +- -doc subpkg + * Sat Sep 07 2013 Rex Dieter 5.1.1-2 - ExclusiveArch: %%{ix86} x86_64 %%{arm} (to match qt5-qtdeclarative) diff --git a/sources b/sources index 0eca636..333a977 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b6e74bd7752bc241617f41539632bba qtmultimedia-opensource-src-5.1.1.tar.xz +042c6f46ab581a2c2331b74969469f8d qtmultimedia-opensource-src-5.2.0-alpha.tar.xz