[libmspub] Resolves: rhbz#1001245 duplicate documentation files / potentially conflicting

David Tardon dtardon at fedoraproject.org
Fri Aug 30 17:40:15 UTC 2013


commit 7d6c3692acf809107241337e527f7d0b6b4dc9d8
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Aug 30 19:39:10 2013 +0200

    Resolves: rhbz#1001245 duplicate documentation files / potentially conflicting

 libmspub.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/libmspub.spec b/libmspub.spec
index 1dc9972..c76a03f 100644
--- a/libmspub.spec
+++ b/libmspub.spec
@@ -2,7 +2,7 @@
 
 Name: libmspub
 Version: 0.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A library providing ability to interpret and import Microsoft Publisher files
 
 Group: System Environment/Libraries
@@ -65,6 +65,8 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}/%{_libdir}/*.la
+# rhbz#1001245 we install API docs directly from build
+rm -rf %{buildroot}/%{_docdir}/%{name}
 
 
 %post -p /sbin/ldconfig
@@ -87,8 +89,7 @@ rm -f %{buildroot}/%{_libdir}/*.la
 
 %files doc
 %doc COPYING.*
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/html
+%doc docs/doxygen/html
 
 
 %files tools
@@ -97,6 +98,9 @@ rm -f %{buildroot}/%{_libdir}/*.la
 
 
 %changelog
+* Fri Aug 30 2013 David Tardon <dtardon at redhat.com> - 0.0.6-4
+- Resolves: rhbz#1001245 duplicate documentation files / potentially conflicting
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list