From 6ae3b3d5b4e7157f643580960f063f7afc813708c4091330d288fc8c3a829685 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 15 Dec 2017 13:04:42 +0000 Subject: [PATCH] Accepting request 545941 from KDE:Qt5 Qt 5.9.3 OBS-URL: https://build.opensuse.org/request/show/545941 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdoc?expand=0&rev=23 --- libqt5-qtdoc.changes | 14 +++ libqt5-qtdoc.spec | 145 ++++++++++++++++++---- qt-docs-qchs-5.9.2.tar.xz | 3 - qt-everywhere-opensource-src-5.9.3.tar.xz | 3 + qtdoc-opensource-src-5.9.2.tar.xz | 3 - 5 files changed, 139 insertions(+), 29 deletions(-) delete mode 100644 qt-docs-qchs-5.9.2.tar.xz create mode 100644 qt-everywhere-opensource-src-5.9.3.tar.xz delete mode 100644 qtdoc-opensource-src-5.9.2.tar.xz diff --git a/libqt5-qtdoc.changes b/libqt5-qtdoc.changes index faaf28e..15ad28f 100644 --- a/libqt5-qtdoc.changes +++ b/libqt5-qtdoc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Nov 25 12:46:36 UTC 2017 - fabian@ritter-vogt.de + +- Update to 5.9.3 + * New bugfix release + * For more details, see: + http://code.qt.io/cgit/qt/qtdoc.git/tree/dist/changes-5.9.3/?h=v5.9.3 + +------------------------------------------------------------------- +Thu Nov 2 13:20:13 UTC 2017 - tittiatcoke@gmail.com + +- Actually build the html and QCH documentation files from source + - Split in three separate packages (qch, html, devel) + ------------------------------------------------------------------- Sun Oct 8 14:04:59 UTC 2017 - lbeltrame@kde.org diff --git a/libqt5-qtdoc.spec b/libqt5-qtdoc.spec index de34a27..51fbaf6 100644 --- a/libqt5-qtdoc.spec +++ b/libqt5-qtdoc.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtdoc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,71 @@ # nodebuginfo +%define real_version 5.9.3 +%define tar_version qt-everywhere-opensource-src-5.9.3 Name: libqt5-qtdoc -Version: 5.9.2 +Version: 5.9.3 Release: 0 -%define base_name libqt5 -%define real_version 5.9.2 -%define tar_version qtdoc-opensource-src-%{real_version} -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qttools +Summary: Qt 5 API Documentation +License: SUSE-LGPL-2.1-with-digia-exception-1.1 OR GPL-3.0 +Group: Documentation/Other +URL: https://www.qt.io +Source: https://download.qt.io/official_releases/qt/5.9/%{real_version}/single/%{tar_version}.tar.xz +BuildRequires: alsa-devel +BuildRequires: cups-devel +BuildRequires: double-conversion-devel +BuildRequires: gcc-c++ +BuildRequires: libicu-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: libmysqlclient-devel +BuildRequires: libpng-devel +BuildRequires: libproxy-devel +BuildRequires: libpulse-devel +BuildRequires: libqt5-qtbase-devel >= %{version} +BuildRequires: libqt5-qttools-devel >= %{version} +BuildRequires: libqt5-qtbase-common-devel >= %{version} +BuildRequires: libtiff-devel +BuildRequires: lksctp-tools-devel +BuildRequires: openssl-devel +BuildRequires: pcre-devel +BuildRequires: pcre2-devel +BuildRequires: pkgconfig +BuildRequires: postgresql-devel +BuildRequires: sqlite3-devel +BuildRequires: tslib-devel +BuildRequires: unixODBC-devel +BuildRequires: xcb-util-image-devel +BuildRequires: xcb-util-keysyms-devel +BuildRequires: xcb-util-renderutil-devel +BuildRequires: xcb-util-wm-devel +BuildRequires: xorg-x11-devel BuildRequires: xz -Url: https://www.qt.io -Summary: Qt 5 Doc -License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 -Group: Documentation/HTML +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(mtdev) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 +BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 +BuildRequires: fdupes BuildArch: noarch -Source: https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz -Source2: qt-docs-qchs-%{real_version}.tar.xz -# Replaced in Qt 5.9.2-rc +Requires: %{name}-html = %{version} +Requires: %{name}-qch = %{version} +# Replaced in Qt 5.9.1-rc Provides: libqt5-qtcharts-docs = %{version} Obsoletes: libqt5-qtcharts-docs < %{version} Provides: libqt5-qtdatavis3d-docs = %{version} Obsoletes: libqt5-qtdatavis3d-docs < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Qt is a set of libraries for developing applications. @@ -46,23 +89,79 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. +%package html +Summary: Qt 5 API Documentation in HTML format +Group: Documentation/HTML +%description html +This package contains the Qt API documentation in html format. + +%package qch +Summary: Qt 5 API Documentation in QCH format +Group: Documentation/Other + +%description qch +This package contains the Qt API Documentation in QCH format, which can be used by tools like KDevelop, Qt Assistant, Qt Creator, etc. + +%package devel +Summary: QDoc index files and doxygen tag files for Qt 5 API Documentation +Group: Development/Tools/Doc Generators +Requires: libqt5-qttools => %{verson} +Requires: doxygen + +%description devel +This package contains the QDoc index files and the doxygen tag files to create cross links between the QCH documentation files. This package is normally not +required. %prep -%setup -q -n qtdoc-opensource-src-%{real_version} +%setup -q -n %{tar_version} %build +# We need to link to some of the programs used as that the source assumes they were just build. +ln -s %{_bindir}/rcc-qt5 qtbase/bin/rcc +ln -s %{_bindir}/uic-qt5 qtbase/bin/uic +ln -s %{_bindir}/moc-qt5 qtbase/bin/moc +ln -s %{_libqt5_bindir} qttools/bin + +# Create the Makefiles which are required. +# To-Do: Clean up of the options and with this also the BuildRequires. + +# FIXME: you should use the %%configure macro +./configure \ + -verbose \ + -prefix %{_prefix} \ + -bindir %{_libqt5_bindir} \ + -docdir %{_libqt5_docdir} \ + -accessibility \ + -no-strip \ + -opensource \ + -confirm-license \ + -release \ + -nomake tests \ + -nomake examples + +%make_jobs docs %install -mkdir -p $RPM_BUILD_ROOT%{_libqt5_docdir} -cd $RPM_BUILD_ROOT%{_libqt5_docdir} -xzdec -c %{SOURCE2} | tar x --strip-components 1 -# global doc's are provided with qtbase module -rm -rf $RPM_BUILD_ROOT%{_libqt5_docdir}/global/ +make INSTALL_ROOT=%{buildroot} install_docs +%fdupes %{buildroot}%{_libqt5_docdir} %files -%defattr(-,root,root,755) %doc LICENSE.* -%{_libqt5_docdir} + +%files html +%doc LICENSE.* +%{_libqt5_docdir}/*/ +%exclude %{_libqt5_docdir}/*/*.index +%exclude %{_libqt5_docdir}/*/*.tags + +%files qch +%doc LICENSE.* +%{_libqt5_docdir}/*.qch + +%files devel +%doc LICENSE.* +%{_libqt5_docdir}/*/*.index +%{_libqt5_docdir}/*/*.tags %changelog diff --git a/qt-docs-qchs-5.9.2.tar.xz b/qt-docs-qchs-5.9.2.tar.xz deleted file mode 100644 index a59fcf1..0000000 --- a/qt-docs-qchs-5.9.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:192b880c4de78fa5d9f47708863cf0ab9c08f2a5b30f7f09b08b52bc1b8b19d0 -size 227883012 diff --git a/qt-everywhere-opensource-src-5.9.3.tar.xz b/qt-everywhere-opensource-src-5.9.3.tar.xz new file mode 100644 index 0000000..cea9f22 --- /dev/null +++ b/qt-everywhere-opensource-src-5.9.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57acd8f03f830c2d7dc29fbe28aaa96781b2b9bdddce94196e6761a0f88c6046 +size 407364020 diff --git a/qtdoc-opensource-src-5.9.2.tar.xz b/qtdoc-opensource-src-5.9.2.tar.xz deleted file mode 100644 index b8113cc..0000000 --- a/qtdoc-opensource-src-5.9.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8919149d1507f60784ffc1bbc5b0285e46e66867b82001e3d79727872052db35 -size 2890840