[munin] BZ# 993985: munin possibly affected by F-20 unversioned docdir change

fenris02 fenris02 at fedoraproject.org
Fri Aug 16 13:21:29 UTC 2013


commit a458786c98f974f1df1bd20d633d61ba0e30bb20
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Aug 16 08:21:10 2013 -0500

    BZ# 993985: munin possibly affected by F-20 unversioned docdir change

 munin.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/munin.spec b/munin.spec
index 68cf9bc..12820a3 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -337,7 +337,11 @@ rm -rf ${buildroot}
 export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$(build-classpath mx4j):$CLASSPATH
 make    CONFIG=Makefile.config-dist \
         DESTDIR=%{buildroot} \
+%if 0%{?rhel} > 7 || 0%{?fedora} > 19
+        DOCDIR=%{buildroot}%{_docdir}/%{name} \
+%else
         DOCDIR=%{buildroot}%{_docdir}/%{name}-%{version} \
+%endif
         JAVALIBDIR=%{buildroot}%{_datadir}/java \
         MANDIR=%{buildroot}%{_mandir} \
         PREFIX=%{buildroot}%{_prefix} \
@@ -773,6 +777,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 16 2013 D. Johnson <fenris02 at fedoraproject.org> - 2.0.17-5
+- BZ# 993985: munin possibly affected by F-20 unversioned docdir change
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list