[wordnet/f13/master] Remove Makefiles from documentation clashing in multiarch

Petr Pisar ppisar at fedoraproject.org
Mon Nov 29 12:39:12 UTC 2010


commit d1e58d9717d5d3fca02ca637d77eadac489b1629
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Nov 29 13:26:02 2010 +0100

    Remove Makefiles from documentation clashing in multiarch

 wordnet.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/wordnet.spec b/wordnet.spec
index ed22b38..e0b17c5 100644
--- a/wordnet.spec
+++ b/wordnet.spec
@@ -1,6 +1,6 @@
 Name:           wordnet
 Version:        3.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A lexical database for the English language
 
 Group:          Applications/Text
@@ -76,6 +76,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f  $RPM_BUILD_ROOT%{_libdir}/libWN.la
 # Remove duplicate copies of docs installed by make install
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/doc
+# Remove useless Makefiles installed by %%doc
+rm -rf doc/{html,ps,pdf}/Makefile*
 
 
 %clean
@@ -105,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 29 2010 Petr Pisar <ppisar at redhat.com> - 3.0-14
+- Remove Makefiles from documentation clashing in multiarch installation
+  (#658118).
+
 * Fri Apr 30 2010 Petr Pisar <ppisar at redhat.com> - 3.0-13
 - Add GPLv2+ license tag because wishwn(1) manual page is GPLv2+-licensed.
 


More information about the scm-commits mailing list