[gammaray/f20] Fix duplicate documentation files (#1001275)

Daniel Vrátil dvratil at fedoraproject.org
Tue Aug 27 15:57:54 UTC 2013


commit 769464daeb0ec345b2b51eb5d18225df9b150372
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Aug 27 17:47:06 2013 +0200

    Fix duplicate documentation files (#1001275)

 gammaray.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/gammaray.spec b/gammaray.spec
index be68ba6..8f67b36 100644
--- a/gammaray.spec
+++ b/gammaray.spec
@@ -2,7 +2,7 @@
 
 Name:           gammaray
 Version:        1.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A tool for examining internals of Qt applications
 
 License:        GPLv2+
@@ -69,11 +69,13 @@ make docs
 mkdir -p %{buildroot}/%{_docdir}/gammaray/html
 cp -r %{_builddir}/GammaRay-%{version}/apidocs/html/* %{buildroot}/%{_docdir}/gammaray/html/
 
+# Copy ReadMe.txt and License.txt so that we can install it with doc subpkg
+cp %{_builddir}/GammaRay-%{version}/{License.txt,ReadMe.txt} %{buildroot}/%{_docdir}/gammaray/
+
 # Force remove rpath from a plugin
 chrpath --delete %{buildroot}/%{_qt4_plugindir}/gammaray/gammaray_kjobtracker_plugin.so
 
 %files
-%doc License.txt ReadMe.txt
 %{_bindir}/gammaray
 %{_qt4_libdir}/*.so
 %{_qt4_plugindir}/styles/*.so
@@ -87,9 +89,13 @@ chrpath --delete %{buildroot}/%{_qt4_plugindir}/gammaray/gammaray_kjobtracker_pl
 %{_includedir}/gammaray
 
 %files doc
+%{_docdir}/gammaray/*.txt
 %{_docdir}/gammaray/html/
 
 %changelog
+* Tue Aug 27 2013 Daniel Vrátil <dvratil at redhat.com> - 1.3.1-3
+- fix duplicate documentation files (#1001275)
+
 * Tue Aug 27 2013 Daniel Vrátil <dvratil at redhat.com> - 1.3.1-2
 - update Qt sources
 - fix build against VTK 6.0


More information about the scm-commits mailing list