diff --git a/.gitignore b/.gitignore index a7f02d5..2290218 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/qtxmlpatterns-opensource-src-5.0.2.tar.xz /qtxmlpatterns-opensource-src-5.1.1.tar.xz +/qtxmlpatterns-opensource-src-5.2.0-alpha.tar.xz diff --git a/qt5-qtxmlpatterns.spec b/qt5-qtxmlpatterns.spec index 5885672..cbbf994 100644 --- a/qt5-qtxmlpatterns.spec +++ b/qt5-qtxmlpatterns.spec @@ -1,15 +1,24 @@ %global qt_module qtxmlpatterns +%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 - QtXmlPatterns component Name: qt5-%{qt_module} -Version: 5.1.1 -Release: 1%{?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 # http://bugzilla.redhat.com/1005482 ExcludeArch: ppc64 ppc @@ -29,6 +38,17 @@ Requires: qt5-qtbase-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}} @@ -39,23 +59,28 @@ Requires: qt5-qtbase-devel%{?_isa} 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 + # put non-conflicting binaries with -qt5 postfix in %{_bindir} mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt5_bindir} for i in * ; do case "${i}" in xmlpatterns|xmlpatternsvalidator) - mv $i ../../../bin/${i}-qt5 - ln -s ../../../bin/${i}-qt5 . - ln -s ../../../bin/${i}-qt5 $i + ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 + ln -sv ${i} ${i}-qt5 ;; - *) - mv $i ../../../bin/ - ln -s ../../../bin/$i . + *) + ln -v ${i} %{buildroot}%{_bindir}/${i} ;; esac done @@ -90,8 +115,18 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %{_qt5_libdir}/pkgconfig/Qt5*.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri +%if 0%{?docs} +%files doc +%{_qt5_docdir}/qtxmlpatterns.qch +%{_qt5_docdir}/qtxmlpatterns/ +%endif + %changelog +* Wed Oct 02 2013 Rex Dieter 5.2.0-0.1.alpha +- 5.2.0-alpha +- -doc subpkg + * Wed Aug 28 2013 Rex Dieter 5.1.1-1 - 5.1.1 diff --git a/sources b/sources index cb3ae12..b17087e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0db5f74de2a2e93bc2747a609ff81d5f qtxmlpatterns-opensource-src-5.1.1.tar.xz +7c894b90487bc347a75bd07810226ae3 qtxmlpatterns-opensource-src-5.2.0-alpha.tar.xz