[qt-creator/f19] Documentation subpackage

Sandro Mani smani at fedoraproject.org
Tue Jul 29 13:29:41 UTC 2014


commit 55b0a8b4c7e049e94a27b7a03c0af829bdcb49d0
Author: Sandro Mani <manisandro at gmail.com>
Date:   Tue Jul 29 15:28:45 2014 +0200

    Documentation subpackage

 qt-creator.spec |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index eab05f3..f422180 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -2,7 +2,7 @@
 
 Name:           qt-creator
 Version:        3.1.2
-Release:        1%{?pre:.%pre}%{?dist}
+Release:        2%{?pre:.%pre}%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -10,6 +10,9 @@ License:        LGPLv2 with exceptions
 URL:            http://qt.digia.com/Product/Qt-Core-Features-Functions/Developer-Tools/
 Source0:        http://download.qt-project.org/%{?pre:development}%{!?pre:official}_releases/qtcreator/3.1/%{version}%{?pre:-%pre}/qt-creator-opensource-src-%{version}%{?pre:-%pre}.tar.gz
 
+# Fix doc dir (Fedora package is called qt-creator, not qtcreator)
+Patch0:         qt-creator_docdir.patch
+
 Source1:        qtcreator.desktop
 Source2:        qt-creator-Fedora-privlibs
 Source3:        qtcreator.appdata.xml
@@ -35,6 +38,14 @@ BuildRequires:  appdata-tools
 BuildRequires:  llvm-devel
 BuildRequires:  clang-devel
 
+%package doc
+Summary:        User documentation for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description doc
+User documentation for %{name}.
+
 # long list of private shared lib names to filter out
 %include %{SOURCE2}
 %global __provides_exclude ^(%{privlibs})\.so
@@ -46,6 +57,7 @@ tailored to the needs of Qt developers.
 
 %prep
 %setup -q -n qt-creator-opensource-src-%{version}%{?pre:-%pre}
+%patch0 -p1
 
 %build
 export QTDIR="%{_qt4_prefix}"
@@ -57,9 +69,11 @@ export LLVM_INSTALL_DIR="%{_libdir}/llvm"
 
 qmake-qt4 -r IDE_LIBRARY_BASENAME=%{_lib}
 make %{?_smp_mflags}
+make qch_docs %{?_smp_mflags}
 
 %install
 make install INSTALL_ROOT=%{buildroot}/%{_prefix}
+make install_inst_qch_docs INSTALL_ROOT=%{buildroot}/%{_prefix}
 
 for i in 16 24 32 48 64 128 256; do
     mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/${i}x${i}/apps
@@ -102,6 +116,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
+%exclude %{_defaultdocdir}/%{name}/qtcreator.qch
 %{_bindir}/buildoutputparser
 %{_bindir}/qmlpuppet
 %{_bindir}/qtpromaker
@@ -114,9 +129,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/qtcreator.desktop
 %{_datadir}/appdata/qtcreator.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/QtProject-qtcreator.png
-#%%{_datadir}/doc/qtcreator/qtcreator.qch
+
+%files doc
+%doc %{_defaultdocdir}/%{name}/qtcreator.qch
 
 %changelog
+* Tue Jul 29 2014 Sandro Mani <manisandro at gmail.com> - 3.1.2-2
+- doc subpackage
+
 * Thu Jun 26 2014 Sandro Mani <manisandro at gmail.com> - 3.1.2-1
 - 3.1.2 stable release
 


More information about the scm-commits mailing list